Make the serializer behave like a normal func with unknown kwargs

gsnedders · gsnedders · commit 28fb733b1519 · 2016-05-17T23:09:57.000+01:00
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
@@ -155,6 +155,9 @@ def __init__(self, **kwargs):
 
         .. _html5lib user documentation: http://code.google.com/p/html5lib/wiki/UserDocumentation
         """
+        unexpected_args = frozenset(kwargs) - frozenset(self.options)
+        if len(unexpected_args) > 0:
+            raise TypeError("__init__() got an unexpected keyword argument '%s'" % next(iter(unexpected_args)))
         if 'quote_char' in kwargs:
             self.use_best_quote_char = False
         for attr in self.options:
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
@@ -79,9 +79,12 @@ def _convertAttrib(self, attribs):
 
 def serialize_html(input, options):
     options = dict([(str(k), v) for k, v in options.items()])
+    encoding = options.get("encoding", None)
+    if "encoding" in options:
+        del options["encoding"]
     stream = Lint(JsonWalker(input), False)
     serializer = HTMLSerializer(alphabetical_attributes=True, **options)
-    return serializer.render(stream, options.get("encoding", None))
+    return serializer.render(stream, encoding)
 
 
 def runSerializerTest(input, expected, options):
