saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into add-queue-config-and-max-limit

Browse source
This commit is contained in:
Nicholas Hughes 2022-12-22 09:43:59 -05:00 • committed by GitHub
commit fd11556b0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/63350.fixed Normal file
View file

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

7
salt/utils/pkg/win.py
View file

@ -72,12 +72,7 @@ try:
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

16
salt/utils/versions.py
View file

@ -18,15 +18,23 @@ import numbers
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__)