fixup! Google Code Issue 157: Add "escape invisible characters" option

gsnedders · gsnedders · commit 93440015e6e4 · 2013-05-04T13:56:03.000+01:00
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
@@ -167,7 +167,7 @@ def __init__(self, **kwargs):
     def encode(self, string):
         assert(isinstance(string, text_type))
         if self.escape_invisible:
-            text = utils.escapeInvisible(text, self.escape_invisible == 'named')
+            string = utils.escapeInvisible(string, self.escape_invisible == 'named')
         if self.encoding:
             return string.encode(self.encoding, unicode_encode_errors)
         else:
diff --git a/html5lib/utils.py b/html5lib/utils.py
@@ -2,6 +2,8 @@
 
 from types import ModuleType
 
+from six import text_type
+
 from .constants import invisibleChars
 
 
@@ -87,11 +89,11 @@ def escapeInvisible(text, useNamedEntities=False):
         if ord(c) in invisibleChars:
             escapable.add(c)
     if useNamedEntities:
+        # for c in escapable:
+        #     name = codepoint2name.get(ord(c))
+        #     escape = "&%s;" % name if name else "&#x%X;" % ord(c)
+        #     text = text.replace(c, escape)
         raise NotImplementedError("This doesn't work on Python 3")
-        for c in escapable:
-            name = codepoint2name.get(ord(c))
-            escape = "&%s;" % name if name else "&#x%X;" % ord(c)
-            text = text.replace(c, escape)
     else:
         for c in escapable:
             text = text.replace(c, "&#x%X;" % ord(c))
