Apply suggestions from code review; Remove unnecessary str calls

Co-authored-by: Carson Sievert <[email protected]>

Author: schloerke

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * `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)
+* `Tag` attributes now error when given an `HTML()` object. To fix, use `str()` to get a string (e.g., `div(foo=str(HTML("bar")))`. (#86)
 
 * `Tag` and `TagList`'s method `.get_html_string()` now both return `str` instead of `HTML`. (#86)
 

htmltools/_core.py

@@ -438,8 +438,6 @@ def update(  # type: ignore[reportIncompatibleMethodOverride] # TODO-future: fix
                     continue
                 nm = self._normalize_attr_name(k)
 
-                # Preserve the HTML() when combining two HTML() attributes
-                # Escape any non-HTML values before combining
                 if nm in attrz:
                     val = attrz[nm] + " " + val
 
@@ -662,9 +660,6 @@ def remove_class(self: TagT, class_: str) -> TagT:
 
         # Remove the class value from the ordered set of class values
         # Note: .split() splits on any whitespace and removes empty strings
-        cls_is_html = isinstance(cls, HTML)
-        if cls_is_html:
-            cls = cls.as_string()
         new_classes = [cls_val for cls_val in cls.split() if cls_val != class_]
         if len(new_classes) > 0:
             # Store the new class value
@@ -690,7 +685,7 @@ def has_class(self, class_: str) -> bool:
         """
         cls = self.attrs.get("class")
         if cls:
-            return class_ in str(cls).split()
+            return class_ in cls.split()
         else:
             return False
 
@@ -1261,8 +1256,6 @@ class HTML(UserString):
     """
 
     def __init__(self, html: object) -> None:
-        if isinstance(html, HTML):
-            html = html.as_string()
         super().__init__(str(html))
 
     def __str__(self) -> str:
@@ -1299,9 +1292,6 @@ def __radd__(self, other: object) -> HTML:
         # Case: `str + HTML()`
         return HTML(html_escape(str(other)) + self.as_string())
 
-    def __eq__(self, x: object) -> bool:
-        # Set `x` first so that it can dispatch to the other object's __eq__ method as we've upgraded to `str`
-        return x == self.as_string()
 
     def __repr__(self) -> str:
         return self.as_string()