Changeset 197

Timestamp:

02/27/2008 03:46:19 PM (10 months ago)

Author:

funkiedamouse

Message:

Modified ElementTree? imports to work with both Python 2.5-bundled ElementTree? and pre-2.5 third-party ElementTree? modules.

Files:

• trunk/examples/xmlcontrol.py (modified) (2 diffs)

trunk/examples/xmlcontrol.py

@@ -2 +2 @@
 from os.path import split, join
 
-from xml.etree.ElementTree import parse
-from xml.etree.ElementInclude import include, default_loader
+try:
+        # Python 2.5 bundled elementtree
+        from xml.etree import ElementTree, ElementInclude
+except ImportError:
+        # Pre-2.5 third party elementtree
+        from elementtree import ElementTree, ElementInclude
 
 
@@ -34 +38 @@
         """Fix relative references and call the default loader."""
 
-        return default_loader(join(self.base, href), typ, encoding)
+        return ElementInclude.default_loader(join(self.base, href), typ, encoding)
 
 def load_menus(path):
     """Load the file path."""
 
-    menus = parse(path)
-    include(menus.getroot(), loader=Loader(path))
+    menus = ElementTree.parse(path)
+    ElementInclude.include(menus.getroot(), loader=Loader(path))
     return menus