[Boost-commit] svn:boost r75414 - in branches/release: boost/python libs/python libs/python/pyste/src/Pyste

Subject: [Boost-commit] svn:boost r75414 - in branches/release: boost/python libs/python libs/python/pyste/src/Pyste
From: rwgk_at_[hidden]
Date: 2011-11-08 16:27:06

Author: rwgk
Date: 2011-11-08 16:27:05 EST (Tue, 08 Nov 2011)
New Revision: 75414
URL: http://svn.boost.org/trac/boost/changeset/75414

Log:
merging current boost/python and libs/python from trunk into release branch
Properties modified: 
   branches/release/boost/python/   (props changed)
   branches/release/libs/python/   (props changed)
Text files modified: 
   branches/release/libs/python/pyste/src/Pyste/GCCXMLParser.py |    12 ++++++++----                            
   1 files changed, 8 insertions(+), 4 deletions(-)

Modified: branches/release/libs/python/pyste/src/Pyste/GCCXMLParser.py
==============================================================================
--- branches/release/libs/python/pyste/src/Pyste/GCCXMLParser.py	(original)
+++ branches/release/libs/python/pyste/src/Pyste/GCCXMLParser.py	2011-11-08 16:27:05 EST (Tue, 08 Nov 2011)
@@ -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