Fix the moduleFactoryFactory to cache based on *args and **kwargs.

gsnedders · gsnedders · commit 40d007a20b05 · 2015-12-03T04:37:37.000Z
diff --git a/html5lib/tests/test_parser2.py b/html5lib/tests/test_parser2.py
@@ -40,12 +40,12 @@ def test_namespace_html_elements_1_dom(self):
     def test_namespace_html_elements_0_etree(self):
         parser = html5parser.HTMLParser(namespaceHTMLElements=True)
         doc = parser.parse("<html></html>")
-        self.assertTrue(list(doc)[0].tag == "{%s}html" % (namespaces["html"],))
+        self.assertTrue(doc.tag == "{%s}html" % (namespaces["html"],))
 
     def test_namespace_html_elements_1_etree(self):
         parser = html5parser.HTMLParser(namespaceHTMLElements=False)
         doc = parser.parse("<html></html>")
-        self.assertTrue(list(doc)[0].tag == "html")
+        self.assertTrue(doc.tag == "html")
 
     def test_unicode_file(self):
         parser = html5parser.HTMLParser()
diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
@@ -60,7 +60,7 @@ def PullDOMAdapter(node):
     pass
 else:
     treeTypes['ElementTree'] = \
-        {"builder": treebuilders.getTreeBuilder("etree", ElementTree),
+        {"builder": treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True),
          "walker": treewalkers.getTreeWalker("etree", ElementTree)}
 
 try:
@@ -69,7 +69,7 @@ def PullDOMAdapter(node):
     pass
 else:
     treeTypes['cElementTree'] = \
-        {"builder": treebuilders.getTreeBuilder("etree", ElementTree),
+        {"builder": treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True),
          "walker": treewalkers.getTreeWalker("etree", ElementTree)}
 
 
diff --git a/html5lib/utils.py b/html5lib/utils.py
@@ -91,13 +91,21 @@ def moduleFactory(baseModule, *args, **kwargs):
         else:
             name = b"_%s_factory" % baseModule.__name__
 
-        if name in moduleCache:
-            return moduleCache[name]
-        else:
+        kwargs_tuple = tuple(kwargs.items())
+
+        try:
+            return moduleCache[name][args][kwargs_tuple]
+        except KeyError:
             mod = ModuleType(name)
             objs = factory(baseModule, *args, **kwargs)
             mod.__dict__.update(objs)
-            moduleCache[name] = mod
+            if "name" not in moduleCache:
+                moduleCache[name] = {}
+            if "args" not in moduleCache[name]:
+                moduleCache[name][args] = {}
+            if "kwargs" not in moduleCache[name][args]:
+                moduleCache[name][args][kwargs_tuple] = {}
+            moduleCache[name][args][kwargs_tuple] = mod
             return mod
 
     return moduleFactory
