Merge branch 'main' into html_not_str

Author: schloerke

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
+  - repo: https://github.com/psf/black
+    rev: "24.2.0"
     hooks:
       - id: black
         language_version: python3

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
-* `HTML` no longer inherits from `str`. This was done to avoid confusion between strings and `HTML` objects. (#86)
+* `HTML` no longer inherits from `str`. It now inherits from `collections.UserString`. This was done to avoid confusion between `str` and `HTML` objects. (#86)
 
 * `Tag` attributes no longer silently support `HTML` as values. (#86)
 
@@ -21,6 +21,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Exported `ReprHtml` protocol class. If an object has a `_repr_html_` method, then it is of instance `ReprHtml`. (#86)
 
+## [0.5.3] 2024-07-18
+
+* HTML tags in docstrings are now escaped. (#90)
+
+## [0.5.2] 2024-05-23
+
+* The `HTMLDependency.copy()` method can now correctly copy folders in depenendencies that both include directories and have `all_files=True`. (#87)
 
 ## [0.5.1] 2023-12-18
 

htmltools/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.1"
+__version__ = "0.5.3"
 
 from . import svg, tags
 from ._core import TagAttrArg  # pyright: ignore[reportUnusedImport] # noqa: F401

htmltools/_core.py

@@ -1631,7 +1631,7 @@ def copy_to(self, path: str, include_version: bool = True) -> None:
         # Verify they all exist
         for f in src_files:
             src_file = os.path.join(paths["source"], f)
-            if not os.path.isfile(src_file):
+            if not os.path.exists(src_file):
                 raise Exception(
                     f"Failed to copy HTML dependency {self.name}-{str(self.version)} "
                     + f"because {src_file} doesn't exist."
@@ -1648,7 +1648,10 @@ def copy_to(self, path: str, include_version: bool = True) -> None:
             src_file = os.path.join(paths["source"], f)
             target_file = os.path.join(target_dir, f)
             os.makedirs(os.path.dirname(target_file), exist_ok=True)
-            shutil.copy2(src_file, target_file)
+            if os.path.isfile(src_file):
+                shutil.copy2(src_file, target_file)
+            elif os.path.isdir(src_file):
+                shutil.copytree(src_file, target_file)
 
     def _validate_dicts(self, ld: Iterable[object], req_attr: list[str]) -> None:
         for d in ld:
@@ -1762,7 +1765,7 @@ def _tag_show(
             import IPython  # pyright: ignore[reportUnknownVariableType]
 
             ipy = (  # pyright: ignore[reportUnknownVariableType]
-                IPython.get_ipython()  # pyright: ignore[reportUnknownMemberType]
+                IPython.get_ipython()  # pyright: ignore[reportUnknownMemberType, reportPrivateImportUsage]
             )
             renderer = "ipython" if ipy else "browser"
         except ImportError: