Revert "Fix cElementTree imports"

This reverts commit 6d365f0.

lib/galaxy/util/__init__.py

@@ -31,8 +31,8 @@
 from hashlib import md5
 from os.path import normpath, relpath
 from xml.etree import (
-    cElementTree,
     ElementInclude,
+    cElementTree as ElementTree
 )
 from xml.etree.ElementTree import ParseError
 
@@ -208,9 +208,9 @@ def unique_id(KEY_SIZE=128):
 
 def parse_xml( fname ):
     """Returns a parsed xml tree"""
-    tree = cElementTree.ElementTree()
+    tree = ElementTree.ElementTree()
     try:
-        root = tree.parse( fname, parser=cElementTree.XMLParser( ) )
+        root = tree.parse( fname, parser=ElementTree.XMLParser( ) )
     except ParseError:
         log.exception("Error parsing file %s", fname)
         raise
@@ -219,7 +219,7 @@ def parse_xml( fname ):
 
 
 def parse_xml_string(xml_string):
-    tree = cElementTree.fromstring(xml_string)
+    tree = ElementTree.fromstring(xml_string)
     return tree
 
 
@@ -228,7 +228,7 @@ def xml_to_string( elem, pretty=False ):
     if pretty:
         elem = pretty_print_xml( elem )
     try:
-        return cElementTree.tostring( elem )
+        return ElementTree.tostring( elem )
     except TypeError as e:
         # we assume this is a comment
         if hasattr( elem, 'text' ):

lib/galaxy/util/xml_macros.py

@@ -1,7 +1,7 @@
 import os
 
 from copy import deepcopy
-from xml.etree import cElementTree, ElementInclude
+from xml.etree import ElementInclude, cElementTree
 
 
 REQUIRED_PARAMETER = object()