Reverting _compat code

salt_cloud/saltcloud/_compat.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+'''
+Salt Cloud compatibility code
+'''
+try:
+    # Python >2.5
+    import xml.etree.cElementTree as ElementTree
+except ImportError:
+    try:
+        # Python >2.5
+        import xml.etree.ElementTree as ElementTree
+    except ImportError:
+        try:
+            # normal cElementTree install
+            import elementtree.cElementTree as ElementTree
+        except ImportError:
+            try:
+                # normal ElementTree install
+                import elementtree.ElementTree as ElementTree
+            except ImportError:
+                raise

salt_cloud/saltcloud/clouds/ec2.py

@@ -83,7 +83,7 @@
 import urllib2
 
 # Import salt libs
-from salt._compat import ElementTree as ET
+from saltcloud._compat import ElementTree as ET
 
 # Import saltcloud libs
 import saltcloud.utils

salt_cloud/saltcloud/clouds/parallels.py

@@ -43,7 +43,7 @@
 
 # Import salt libs
 import salt.utils
-from salt._compat import ElementTree as ET
+from saltcloud._compat import ElementTree as ET
 
 # Import salt cloud libs
 import saltcloud.utils