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

Merge pull request #27551 from silenius/develop

Browse Source 
import ipaddress from _compat module
This commit is contained in:
Mike Place 2015-09-30 10:42:00 -06:00
commit 3db4f9e574
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/network.py
View File

@ -14,10 +14,6 @@ from string import ascii_letters, digits
# Import 3rd-party libs # Import 3rd-party libs
import salt.ext.six as six import salt.ext.six as six
if six.PY3:
import ipaddress
else:
import salt.ext.ipaddress as ipaddress
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
# Attempt to import wmi # Attempt to import wmi
try: try:
@ -28,7 +24,7 @@ except ImportError:
# Import salt libs # Import salt libs
import salt.utils import salt.utils
from salt._compat import subprocess from salt._compat import subprocess, ipaddress
log = logging.getLogger(__name__) log = logging.getLogger(__name__)