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 2

Merge pull request #23328 from s0undt3ch/develop

Browse source 
Py3 fix & unrelated .pylint fix
This commit is contained in:
Justin Findlay 2015-05-04 09:08:46 -06:00
commit 55e2185b02
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.pylintrc
View file

@ -31,8 +31,8 @@ load-plugins=saltpylint.pep8,
saltpylint.strings,
saltpylint.fileperms,
saltpylint.py3modernize,
salttesting.pylintplugins.smartup,
saltpylint.pyminver
saltpylint.smartup,
saltpylint.minpyver
# Use multiple processes to speed up Pylint.
# Don't bump this values on PyLint 1.4.0 - Know bug that ignores the passed --rcfile

5
salt/utils/network.py
View file

@ -15,7 +15,10 @@ from string import ascii_letters, digits
# Import 3rd-party libs
import salt.ext.six as six
import salt.ext.ipaddress as ipaddress
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
# Attempt to import wmi
try: