fixed the unicode/str/six bug, but the test that proves it is in an alien file

Marc DM · Marc DM · commit c8e024b8ae87 · 2013-06-16T18:15:56.000-05:00
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, unicode_literals
-from six import text_type
+from six import text_type, string_types
 
 import gettext
 _ = gettext.gettext
@@ -154,14 +154,14 @@ def __init__(self, **kwargs):
         self.strict = False
 
     def encode(self, string):
-        assert(isinstance(string, text_type))
+        assert(isinstance(string, string_types))
         if self.encoding:
             return string.encode(self.encoding, unicode_encode_errors)
         else:
             return string
 
     def encodeStrict(self, string):
-        assert(isinstance(string, text_type))
+        assert(isinstance(string, string_types))
         if self.encoding:
             return string.encode(self.encoding, "strict")
         else:
diff --git a/html5lib/tests/test_six_encoding.py b/html5lib/tests/test_six_encoding.py
@@ -0,0 +1,17 @@
+
+from html5lib import html5parser, treewalkers, serializer
+from nose.tools import eq_
+
+def test_treewalker6():
+    """Str/Unicode mix. If str attrs added to tree"""
+    
+    text = '<a href="http://example.com">Example</a>'
+    end_text = '<a href="http://example.com" class="test123">Example</a>'
+    parser = html5parser.HTMLParser()
+    walker = treewalkers.getTreeWalker('etree')
+    serializr = serializer.HTMLSerializer(quote_attr_values=True)
+    domtree = parser.parseFragment(text)
+
+    # at this point domtree should be a DOCUMENT_FRAGMENT
+    domtree[0].set('class', 'test123')
+    eq_(end_text, serializr.render(walker(domtree)))
diff --git a/html5lib/treewalkers/_base.py b/html5lib/treewalkers/_base.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, unicode_literals
-from six import text_type
+from six import text_type, string_types
 
 import gettext
 _ = gettext.gettext
@@ -19,43 +19,43 @@ def error(self, msg):
         return {"type": "SerializeError", "data": msg}
 
     def emptyTag(self, namespace, name, attrs, hasChildren=False):
-        assert namespace is None or isinstance(namespace, text_type), type(namespace)
-        assert isinstance(name, text_type), type(name)
-        assert all((namespace is None or isinstance(namespace, text_type)) and
-                   isinstance(name, text_type) and
-                   isinstance(value, text_type)
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
                    for (namespace, name), value in attrs.items())
 
-        yield {"type": "EmptyTag", "name": name,
-               "namespace": namespace,
+        yield {"type": "EmptyTag", "name": text_type(name),
+               "namespace": text_type(namespace),
                "data": attrs}
         if hasChildren:
             yield self.error(_("Void element has children"))
 
     def startTag(self, namespace, name, attrs):
-        assert namespace is None or isinstance(namespace, text_type), type(namespace)
-        assert isinstance(name, text_type), type(name)
-        assert all((namespace is None or isinstance(namespace, text_type)) and
-                   isinstance(name, text_type) and
-                   isinstance(value, text_type)
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
                    for (namespace, name), value in attrs.items())
 
         return {"type": "StartTag",
-                "name": name,
-                "namespace": namespace,
+                "name": text_type(name),
+                "namespace": text_type(namespace),
                 "data": attrs}
 
     def endTag(self, namespace, name):
-        assert namespace is None or isinstance(namespace, text_type), type(namespace)
-        assert isinstance(name, text_type), type(namespace)
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(namespace)
 
         return {"type": "EndTag",
-                "name": name,
-                "namespace": namespace,
+                "name": text_type(name),
+                "namespace": text_type(namespace),
                 "data": {}}
 
     def text(self, data):
-        assert isinstance(data, text_type), type(data)
+        assert isinstance(data, string_types), type(data)
 
         data = data
         middle = data.lstrip(spaceCharacters)
@@ -71,14 +71,14 @@ def text(self, data):
             yield {"type": "SpaceCharacters", "data": right}
 
     def comment(self, data):
-        assert isinstance(data, text_type), type(data)
+        assert isinstance(data, string_types), type(data)
 
         return {"type": "Comment", "data": data}
 
     def doctype(self, name, publicId=None, systemId=None, correct=True):
-        assert name is None or isinstance(name, text_type), type(name)
-        assert publicId is None or isinstance(publicId, text_type), type(publicId)
-        assert systemId is None or isinstance(systemId, text_type), type(systemId)
+        assert name is None or isinstance(name, string_types), type(name)
+        assert publicId is None or isinstance(publicId, string_types), type(publicId)
+        assert systemId is None or isinstance(systemId, string_types), type(systemId)
 
         return {"type": "Doctype",
                 "name": name if name is not None else "",
@@ -87,7 +87,7 @@ def doctype(self, name, publicId=None, systemId=None, correct=True):
                 "correct": correct}
 
     def entity(self, name):
-        assert isinstance(name, text_type), type(name)
+        assert isinstance(name, string_types), type(name)
 
         return {"type": "Entity", "name": name}
 
