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

Fixed some lint

Browse source
This commit is contained in:
twangboy 2015-08-12 16:00:36 -06:00
parent 787c88a283
commit 7393adf5a8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/modules/reg.py
View file

@ -467,13 +467,13 @@ def delete_key_recursive(hive, key):
subkey = _winreg.EnumKey(key, i)
yield subkey
i += 1
except WindowsError:
except WindowsError: # pylint: disable=E0602
break
def traverse_registry_tree(hkey, keypath, ret):
key = _winreg.OpenKey(hkey, keypath, 0, _winreg.KEY_READ)
for subkeyname in subkeys(key):
subkeypath = "{0}\{1}".format(keypath, subkeyname)
subkeypath = r'{0}\{1}'.format(keypath, subkeyname)
ret = traverse_registry_tree(hkey, subkeypath, ret)
ret.append('{0}'.format(subkeypath))
return ret
@ -494,18 +494,18 @@ def delete_key_recursive(hive, key):
for keypath in key_list:
try:
_winreg.DeleteKey(hkey, keypath)
ret['Deleted'].append('{0}\{1}'.format(hive, keypath))
ret['Deleted'].append(r'{0}\{1}'.format(hive, keypath))
except WindowsError as exc: # pylint: disable=E0602
log.error(exc)
ret['Failed'].append('{0}\{1} {2}'.format(hive, key, exc))
ret['Failed'].append(r'{0}\{1} {2}'.format(hive, key, exc))
# Delete the key now that all the subkeys are deleted
try:
_winreg.DeleteKey(hkey, key)
ret['Deleted'].append('{0}\{1}'.format(hive, key))
ret['Deleted'].append(r'{0}\{1}'.format(hive, key))
except WindowsError as exc: # pylint: disable=E0602
log.error(exc)
ret['Failed'].append('{0}\{1} {2}'.format(hive, key, exc))
ret['Failed'].append(r'{0}\{1} {2}'.format(hive, key, exc))
return ret

12
salt/states/reg.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
'''
r'''
===========================
Manage the Windows registry
===========================
@ -206,7 +206,7 @@ def present(name, value=None, vname=None, vdata=None, vtype='REG_SZ', reflection
ret['changes'] = {'reg': {
'Added': {
'Key': '{0}\{1}'.format(hive, key),
'Key': r'{0}\{1}'.format(hive, key),
'Entry': '{0}'.format(vname if vname else '(Default)'),
'Value': '{0}'.format(vdata if vdata else '(Empty String)')
}}}
@ -259,7 +259,7 @@ def absent(name, vname=None):
ret['changes'] = {'reg': {
'Removed': {
'Key': '{0}\{1}'.format(hive, key),
'Key': r'{0}\{1}'.format(hive, key),
'Entry': '{0}'.format(vname if vname else '(Default)')
}}}
@ -272,14 +272,14 @@ def absent(name, vname=None):
ret['result'] = __salt__['reg.delete_value'](hive, key, vname)
if not ret['result']:
ret['changes'] = {}
ret['comment'] = 'failed to remove {0} from {1}\{2}'.format(name, hive,
ret['comment'] = r'failed to remove {0} from {1}\{2}'.format(name, hive,
key)
return ret
def key_absent(name, force=False):
'''
r'''
Ensure a registry key is removed. This will remove a key and all value
entries it contains. It will fail if the key contains subkeys.
@ -326,7 +326,7 @@ def key_absent(name, force=False):
ret['changes'] = {'reg': {
'Removed': {
'Key': '{0}\{1}'.format(hive, key)
'Key': r'{0}\{1}'.format(hive, key)
}}}
# Check for test option