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

Pylint fix

Browse Source
This commit is contained in:
rallytime 2015-03-05 10:31:13 -07:00
parent dbdc12fe11
commit d9d30cc855
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/win_dacl.py
View File

@ -23,16 +23,12 @@ from salt.ext.six.moves import range # pylint: disable=redefined-builtin
# Import third party libs
try:
import salt.ext.six.moves.winreg
import salt.ext.six.moves.winreg # pylint: disable=import-error
import win32security
import ntsecuritycon
HAS_WINDOWS_MODULES = True
except ImportError:
try:
import winreg as _winreg
HAS_WINDOWS_MODULES = True
except ImportError:
HAS_WINDOWS_MODULES = False
HAS_WINDOWS_MODULES = False
log = logging.getLogger(__name__)

1
tests/integration/cloud/providers/joyent.py
View File

@ -19,6 +19,7 @@ import integration
from salt.config import cloud_providers_config
from salt.ext.six.moves import range # pylint: disable=redefined-builtin
def __random_name(size=6):
'''
Generates a random cloud instance name