Merge pull request #34865 from thatch45/break_suse

This needs discussion, since this breaks SUSE
saltstack · Jul 22, 2016 · 584d760 · 584d760
2 parents aaede31 + 6c5f363
commit 584d760
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/salt/utils/thin.py b/salt/utils/thin.py
@@ -54,11 +54,6 @@
     # Older jinja does not need markupsafe
     HAS_MARKUPSAFE = False
 
-try:
-    import xml
-    HAS_XML = True
-except ImportError:
-    HAS_XML = False
 # pylint: enable=import-error,no-name-in-module
 
 try:
@@ -129,10 +124,6 @@ def get_tops(extra_mods='', so_mods=''):
     if HAS_SSL_MATCH_HOSTNAME:
         tops.append(os.path.dirname(os.path.dirname(ssl_match_hostname.__file__)))
 
-    if HAS_XML:
-        # For openSUSE, which apparently doesn't include the whole stdlib
-        tops.append(os.path.dirname(xml.__file__))
-
     for mod in [m for m in extra_mods.split(',') if m]:
         if mod not in locals() and mod not in globals():
             try: