From d140baeeb0a80290c1de226d7521e0a17e38e609 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Wed, 30 Nov 2011 01:35:25 +0000
Subject: [PATCH] Quickbook: Merge from trunk to quickbook-dev

[SVN r75739]
---
 pyste/src/Pyste/GCCXMLParser.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pyste/src/Pyste/GCCXMLParser.py b/pyste/src/Pyste/GCCXMLParser.py
index b9a104c4..4a101720 100644
--- 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