Make cssText return text (str) instead of bytes

- Change do_CSSStyleSheet in serialize.py to return str by decoding after encoding
- Update docstrings in cssstylesheet.py (byte string -> text string)
- Fix script.py to encode cssText when writing to binary files
- Fix examples/website.py to remove .decode() calls (no longer needed)
- Update all test files to compare cssText to str instead of bytes
- Fix basetest.py do_equal_p to not use str(cssText, 'utf-8')
- Fix pre-existing str/bytes comparison bugs in test_cssutils.py
- Fix pre-existing incorrect UnicodeDecodeError expectation in test_parse.py

Agent-Logs-Url: https://github.com/jaraco/cssutils/sessions/3fa81fde-23b2-4404-af80-0fc6925ccf1b

Co-authored-by: jaraco <308610+jaraco@users.noreply.github.com>

Author: Copilot

.gitignore

@@ -0,0 +1,7 @@
+__pycache__/
+*.py[cod]
+*.egg-info/
+*.egg
+dist/
+build/
+.eggs/

cssutils/__pycache__/serialize.cpython-312.pyc

@@ -146,7 +146,7 @@ def cssRules(self, cssRules):
         self._cssRules = cssRules
 
     def _getCssText(self):
-        "Textual representation of the stylesheet (a byte string)."
+        "Textual representation of the stylesheet (a text string)."
         return cssutils.ser.do_CSSStyleSheet(self)
 
     def _setCssText(self, cssText):  # noqa: C901
@@ -361,7 +361,7 @@ def ruleset(expected, seq, token, tokenizer):
     cssText = property(
         _getCssText,
         _setCssText,
-        "Textual representation of the stylesheet (a byte string)",
+        "Textual representation of the stylesheet (a text string)",
     )
 
     def _resolveImport(self, url):

cssutils/css/__pycache__/cssstylesheet.cpython-312.pyc

@@ -310,7 +310,7 @@ def saveto(self, dir, saveraw=False, minified=False):
                 uf = codecs.getwriter('css')(sf)
                 uf.write(cssText)
             else:
-                sf.write(sheet.cssText)
+                sf.write(sheet.cssText.encode(sheet.encoding))
             sf.close()
 
 

cssutils/css/cssstylesheet.py

@@ -408,8 +408,7 @@ def do_CSSStyleSheet(self, stylesheet):
         except (IndexError, AttributeError):
             encoding = 'UTF-8'
 
-        # TODO: py3 return b str but tests use unicode?
-        return text.encode(encoding, 'escapecss')
+        return text.encode(encoding, 'escapecss').decode(encoding)
 
     def do_CSSComment(self, rule):
         """

cssutils/script.py

@@ -38,7 +38,7 @@ def cssparse_example():
     >>> cssutils.log.setLevel(logging.FATAL)
     >>> sheet = cssutils.parseString('@import url(example.css); body { color: red }')
     >>> # log output not shown
-    >>> print(sheet.cssText.decode())
+    >>> print(sheet.cssText)
     @import url(example.css);
     body {
         color: red
@@ -77,7 +77,7 @@ def prefs():
     >>> cssutils.ser.prefs.importHrefFormat = 'uri'
     >>> # or 'string', defaults to the format used in parsed stylesheet
     >>> cssutils.ser.prefs.lineNumbers = True
-    >>> print(sheet.cssText.decode())
+    >>> print(sheet.cssText)
     1: @import url(example.css);
     2: body {
     3:   color: red
@@ -93,7 +93,7 @@ def work_and_build():
     >>> from cssutils import css, stylesheets
     >>> sheet = css.CSSStyleSheet()
     >>> sheet.cssText = '@import url(example.css) tv;'
-    >>> print(sheet.cssText.decode())
+    >>> print(sheet.cssText)
     @import url(example.css) tv;
     >>> style = css.CSSStyleDeclaration()
     >>> style['color'] = 'red' # until 0.9.5: setProperty(u'color', u'red')
@@ -104,7 +104,7 @@ def work_and_build():
     >>> # sheet.insertRule(stylerule, 0) # try before @import
     >>> # xml.dom.HierarchyRequestErr: CSSStylesheet: Found @charset, @import or @namespace before index 0.
     >>> # sheet.insertRule(stylerule) # at end of rules, returns index
-    >>> print(sheet.cssText.decode())
+    >>> print(sheet.cssText)
     @import url(example.css) tv;
     body {
         color: red
@@ -115,7 +115,7 @@ def work_and_build():
     >>> # returns the new Selector:
     >>> sheet.cssRules[1].selectorList.appendSelector('a')
     cssutils.css.Selector(selectorText='a')
-    >>> print(sheet.cssText.decode())
+    >>> print(sheet.cssText)
     @import url(example.css) tv, print;
     body, a {
         color: red

cssutils/serialize.py

@@ -26,7 +26,7 @@ def do_equal_p(tests, att='cssText', raising=True):
             s = p.parseString(test)
             if expected is None:
                 expected = test
-            assert str(s.__getattribute__(att), 'utf-8') == expected
+            assert s.__getattribute__(att) == expected
 
     @staticmethod
     def do_raise_p(tests, raising=True):