Make cssText return str instead of bytes

cssutils/css/cssstylesheet.py

@@ -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/script.py

@@ -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/serialize.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):
         """

examples/website.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

tests/basetest.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):

tests/test_cssimportrule.py

@@ -211,12 +211,12 @@ def fetcher(url):
         sheet = parser.parseString('@import "http://example.com/yes" "name"')
 
         r = sheet.cssRules[0]
-        assert b'/**/' == r.styleSheet.cssText
+        assert '/**/' == r.styleSheet.cssText
         assert r.hrefFound
         assert 'name' == r.name
 
         r.cssText = '@import url(http://example.com/none) "name2";'
-        assert b'' == r.styleSheet.cssText
+        assert '' == r.styleSheet.cssText
         assert not r.hrefFound
         assert 'name2' == r.name
 
@@ -349,7 +349,7 @@ def fetcher(url):
         assert ir.styleSheet.title == 'title'
         assert (
             ir.styleSheet.cssText
-            == b'@charset "ascii";\n@import "level2/css.css" "title2";'
+            == '@charset "ascii";\n@import "level2/css.css" "title2";'
         )
 
         ir2 = ir.styleSheet.cssRules[1]
@@ -361,9 +361,7 @@ def fetcher(url):
         assert ir2.styleSheet.media.mediaText == 'all'
         assert ir2.styleSheet.parentStyleSheet is None  # ir.styleSheet
         assert ir2.styleSheet.title == 'title2'
-        assert (
-            ir2.styleSheet.cssText == b'@charset "ascii";\na {\n    color: red\n    }'
-        )
+        assert ir2.styleSheet.cssText == '@charset "ascii";\na {\n    color: red\n    }'
 
         sheet = cssutils.parseString('@import "CANNOT-FIND.css";')
         ir = sheet.cssRules[0]
@@ -372,9 +370,9 @@ def fetcher(url):
 
         def fetcher(url):
             if url.endswith('level1.css'):
-                return None, b'@charset "ascii"; @import "level2.css";'
+                return None, '@charset "ascii"; @import "level2.css";'
             else:
-                return None, b'a { color: red }'
+                return None, 'a { color: red }'
 
         parser = cssutils.CSSParser(fetcher=fetcher)