[patch] python-yadis-1.1.0-elementtree.patch

python-yadis-1.1.0-elementtree.patch (text/plain), 1006 bytes, created by Johan Bergström on 2009-12-23 20:20:09 UTC

diff -ru python-yadis-1.1.0/yadis/etxrd.py yadis-new/yadis/etxrd.py
--- python-yadis-1.1.0/yadis/etxrd.py	2006-12-08 22:17:12.000000000 +0100
+++ yadis-new/yadis/etxrd.py	2009-12-23 19:57:57.000000000 +0100
@@ -20,14 +20,22 @@
 
 import random
 
-from elementtree.ElementTree import ElementTree
+# Python 2.5 and newer bundles elementtree
+try:
+    from xml.etree.ElementTree import ElementTree
+except ImportError:
+    from elementtree.ElementTree import ElementTree
 
 # Use expat if it's present. Otherwise, use xmllib
 try:
     from xml.parsers.expat import ExpatError as XMLError
     from elementtree.ElementTree import XMLTreeBuilder
 except ImportError:
-    from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
+    try:
+        from xml.etree.ElementTree import TreeBuilder as XMLTreeBuilder
+    except ImportError:
+        from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
+
     from xmllib import Error as XMLError
 
 from yadis import xri