merging current boost/python and libs/python from trunk into release branch

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit fa24dbb88f22 · 2011-11-08T21:27:05.000Z
[SVN r75414]
diff --git a/pyste/src/Pyste/GCCXMLParser.py b/pyste/src/Pyste/GCCXMLParser.py
@@ -4,12 +4,16 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 from declarations import *
-# try to use cElementTree if avaiable
 try:
-    from cElementTree import ElementTree    
+    # try to use internal elementtree
+    from xml.etree.cElementTree import ElementTree
 except ImportError:
-    # fall back to the normal elementtree
-    from elementtree.ElementTree import ElementTree
+    # try to use cElementTree if avaiable
+    try:
+        from cElementTree import ElementTree    
+    except ImportError:
+        # fall back to the normal elementtree
+        from elementtree.ElementTree import ElementTree
 from xml.parsers.expat import ExpatError
 from copy import deepcopy
 from utils import enumerate
