Fixes in HTMLSerializer and additional serializer tests.

tbroyer · tbroyer · commit 883b2259a85e · 2007-05-27T14:39:19.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40623
diff --git a/src/serializer.py b/src/serializer.py
@@ -25,14 +25,14 @@ class HTMLSerializer(object):
     quote_char = '"'
     minimize_boolean_attributes = True
 
+    use_trailing_solidus = False
     trailing_solidus = " /"
 
     omit_optional_tags = True
 
     def __init__(self, **kwargs):
-        for attr in ("quote_attr_values", "quote_char",
-          "minimize_boolean_attributes", "trailing_solidus",
-          "omit_optional_tags"):
+        for attr in ("quote_attr_values", "quote_char", "minimize_boolean_attributes",
+          "trailing_solidus", "use_trailing_solidus", "omit_optional_tags"):
             if attr in kwargs:
                 setattr(self, attr, kwargs[attr])
         self.errors = []
@@ -77,7 +77,7 @@ def serialize(self, treewalker):
                       and k not in booleanAttributes.get("", tuple())):
                         attributes.append("=")
                         v = v.replace("&", "&amp;")
-                        if self.quote_attr_values:
+                        if self.quote_attr_values or not v:
                             quote_attr = True
                         else:
                             quote_attr = reduce(lambda x,y: x or y in v,
@@ -92,8 +92,8 @@ def serialize(self, treewalker):
                             attributes.append(self.quote_char)
                         else:
                             attributes.append(v)
-                if name in voidElements and self.include_trailing_slashes:
-                    attributes.append(" /")
+                if name in voidElements and self.use_trailing_solidus:
+                    attributes.append(self.trailing_solidus)
                 yield u"<%s%s>" % (name, u"".join(attributes))
 
             elif type == "EndTag":
@@ -186,8 +186,8 @@ def is_optional_start(self, tagname, next):
         # TODO
         return False
 
-    def _is_optional_end(self, tagname, next_event):
-        type, data = next_event
+    def is_optional_end(self, tagname, next):
+        type = next and next["type"] or None
         if tagname in ('html', 'head', 'body'):
             # An html element's end tag may be omitted if the html element
             # is not immediately followed by a space character or a comment.
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -65,12 +65,13 @@ def normalizeTokens(self, tokens):
             elif type == "EndTag":
                 yield self.endTag(token[1])
             elif type == "EmptyTag":
-                yield self.emptyTag(token[1])
+                for token in self.emptyTag(token[1], token[2]):
+                    yield token
             elif type == "Comment":
                 yield self.comment(token[1])
-            elif type == "Characters":
-                for textToken in self.text(token[1]):
-                    yield textToken
+            elif type in ("Characters", "SpaceCharacters"):
+                for token in self.text(token[1]):
+                    yield token
             elif type == "Doctype":
                 yield self.doctype(token[1])
             else:
@@ -88,7 +89,7 @@ def buildTestSuite():
         tests += 1
         testName = 'test%d' % tests
         TestCase.addTest(testName, test["expected"], test["input"], \
-            test["description"], test["options"])
+            test["description"], test.get("options", {}))
     return unittest.TestLoader().loadTestsFromTestCase(TestCase)
 
 def main():
