Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version

changelog/63350.fixed

@@ -0,0 +1 @@
+Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version, if first not available

salt/utils/pkg/win.py

@@ -75,9 +75,14 @@
 try:
     from salt.utils.versions import LooseVersion
 except ImportError:
-    from setuptools._distutils.version import (
-        LooseVersion,  # pylint: disable=blacklisted-module
-    )
+    try:
+        from setuptools.distutils.version import (
+            LooseVersion,  # pylint: disable=blacklisted-module
+        )
+    except ImportError:
+        from setuptools._distutils.version import (
+            LooseVersion,  # pylint: disable=blacklisted-module
+        )
 
 # pylint: disable=too-many-instance-attributes
 

salt/utils/versions.py

@@ -18,18 +18,29 @@
 import sys
 import warnings
 
-from setuptools._distutils.version import LooseVersion as _LooseVersion
-from setuptools._distutils.version import StrictVersion as _StrictVersion
+log = logging.getLogger(__name__)
+
+try:
+    from setuptools.distutils.version import LooseVersion as _LooseVersion
+    from setuptools.distutils.version import StrictVersion as _StrictVersion
+except ImportError:
+    log.debug(
+        "unable to import from setuptools.distutils.version, will attempt setuptools._distutils.version"
+    )
+    try:
+        from setuptools._distutils.version import LooseVersion as _LooseVersion
+        from setuptools._distutils.version import StrictVersion as _StrictVersion
+    except:
+        log.debug("unable to import from setuptools._distutils.version")
+        raise ImportError()
+
 
 # pylint: enable=blacklisted-module
 import salt.version
 
 # pylint: disable=blacklisted-module
 
 
-log = logging.getLogger(__name__)
-
-
 class StrictVersion(_StrictVersion):
     def parse(self, vstring):
         _StrictVersion.parse(self, vstring)