Release 1.48.0

[SVN r75495]
merging current boost/python and libs/python from trunk into release branch
2026-01-20 04:42:28 +00:00 · 2011-11-15 15:44:44 +00:00 · 2011-11-08 21:27:05 +00:00
1 changed files with 8 additions and 4 deletions
--- 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
Author	SHA1	Message	Date
Beman Dawes	59bc78dae1	Release 1.48.0 [SVN r75495]	2011-11-15 15:44:44 +00:00
Ralf W. Grosse-Kunstleve	fa24dbb88f	merging current boost/python and libs/python from trunk into release branch [SVN r75414]	2011-11-08 21:27:05 +00:00