Merge pull request #63352 from dmurphy18/fix_63350

Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version
saltstack · Dec 22, 2022 · ac6ccb8 · ac6ccb8
2 parents e2ea857 + d51e7db
commit ac6ccb8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/changelog/63350.fixed b/changelog/63350.fixed
@@ -0,0 +1 @@
+Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version, if first not available
diff --git a/salt/utils/pkg/win.py b/salt/utils/pkg/win.py
@@ -72,12 +72,7 @@
 except ImportError:
     from collections import OrderedDict
 
-try:
-    from salt.utils.versions import LooseVersion
-except ImportError:
-    from setuptools._distutils.version import (
-        LooseVersion,  # pylint: disable=blacklisted-module
-    )
+from salt.utils.versions import LooseVersion
 
 # pylint: disable=too-many-instance-attributes
 

diff --git a/salt/utils/versions.py b/salt/utils/versions.py
@@ -18,15 +18,23 @@
 import sys
 import warnings
 
-from setuptools._distutils.version import LooseVersion as _LooseVersion
-from setuptools._distutils.version import StrictVersion as _StrictVersion
+# pylint: disable=blacklisted-module
+try:
+    from setuptools.distutils.version import LooseVersion as _LooseVersion
+    from setuptools.distutils.version import StrictVersion as _StrictVersion
+except ImportError:
+    try:
+        from setuptools._distutils.version import LooseVersion as _LooseVersion
+        from setuptools._distutils.version import StrictVersion as _StrictVersion
+    except ImportError:
+        from distutils.version import LooseVersion as _LooseVersion
+        from distutils.version import StrictVersion as _StrictVersion
+
 
 # pylint: enable=blacklisted-module
 import salt.version
 
 # pylint: disable=blacklisted-module
-
-
 log = logging.getLogger(__name__)