Using types.ModuleType instead of new.module

tahajahangir · tahajahangir · commit b21ed70eca82 · 2011-07-07T15:20:40.000+04:30
diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py
@@ -1,6 +1,9 @@
 
 from xml.dom import minidom, Node, XML_NAMESPACE, XMLNS_NAMESPACE
-import new
+try:
+    from types import ModuleType
+except:
+    from new import module as ModuleType
 import re
 import weakref
 
@@ -15,7 +18,7 @@ def getDomModule(DomImplementation):
     if name in moduleCache:
         return moduleCache[name]
     else:
-        mod = new.module(name)
+        mod = ModuleType(name)
         objs = getDomBuilder(DomImplementation)
         mod.__dict__.update(objs)
         moduleCache[name] = mod    
diff --git a/html5lib/treebuilders/etree.py b/html5lib/treebuilders/etree.py
@@ -1,4 +1,7 @@
-import new
+try:
+    from types import ModuleType
+except:
+    from new import module as ModuleType
 import re
 
 import _base
@@ -15,7 +18,7 @@ def getETreeModule(ElementTreeImplementation, fullTree=False):
     if name in moduleCache:
         return moduleCache[name]
     else:
-        mod = new.module("_" + ElementTreeImplementation.__name__+"builder")
+        mod = ModuleType("_" + ElementTreeImplementation.__name__+"builder")
         objs = getETreeBuilder(ElementTreeImplementation, fullTree)
         mod.__dict__.update(objs)
         moduleCache[name] = mod    
diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
@@ -1,4 +1,3 @@
-import new
 import warnings
 import re
 
diff --git a/html5lib/treewalkers/etree.py b/html5lib/treewalkers/etree.py
@@ -1,7 +1,10 @@
 import gettext
 _ = gettext.gettext
 
-import new
+try:
+    from types import ModuleType
+except:
+    from new import module as ModuleType
 import copy
 import re
 
@@ -17,7 +20,7 @@ def getETreeModule(ElementTreeImplementation):
     if name in moduleCache:
         return moduleCache[name]
     else:
-        mod = new.module("_" + ElementTreeImplementation.__name__+"builder")
+        mod = ModuleType("_" + ElementTreeImplementation.__name__+"builder")
         objs = getETreeBuilder(ElementTreeImplementation)
         mod.__dict__.update(objs)
         moduleCache[name] = mod

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import new`
`2`	`1`	`import warnings`
`3`	`2`	`import re`
`4`	`3`