valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change LooseVersion import to pass integration.modules.Sysmod tests

Browse Source
This commit is contained in:
rallytime 2014-08-19 13:44:11 -06:00
parent 10e4db4ddf
commit 630c469a40
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/boto_secgroup.py
View File

@ -36,7 +36,7 @@ Connection module for Amazon Security Groups
# Import Python libs
import logging
from distutils.version import LooseVersion
from distutils.version import LooseVersion as _LooseVersion
log = logging.getLogger(__name__)
@ -66,7 +66,7 @@ def __virtual__():
# Support for Boto < 2.4.0 can be added if needed
if not HAS_BOTO:
return False
elif LooseVersion(boto.__version__) < LooseVersion(required_boto_version):
elif _LooseVersion(boto.__version__) < _LooseVersion(required_boto_version):
return False
else:
return True

4
salt/modules/boto_vpc.py
View File

@ -37,7 +37,7 @@ Connection module for Amazon VPC
# Import Python libs
import logging
from distutils.version import LooseVersion
from distutils.version import LooseVersion as _LooseVersion
log = logging.getLogger(__name__)
@ -64,7 +64,7 @@ def __virtual__():
# https://github.com/boto/boto/commit/33ac26b416fbb48a60602542b4ce15dcc7029f12
if not HAS_BOTO:
return False
elif LooseVersion(boto.__version__) < LooseVersion(required_boto_version):
elif _LooseVersion(boto.__version__) < _LooseVersion(required_boto_version):
return False
else:
return True