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

lint fixes for static regexes

Browse source
This commit is contained in:
lomeroe 2017-12-15 13:20:55 -06:00
parent 11b637d108
commit f3196d795d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/modules/win_lgpo.py
View file

@ -3541,9 +3541,9 @@ def _checkAllAdmxPolicies(policy_class,
full_names = {}
if policy_filedata:
log.debug('POLICY CLASS {0} has file data'.format(policy_class))
policy_filedata_split = re.sub(b'\]\00$',
policy_filedata_split = re.sub(salt.utils.to_bytes(r'\]{0}$'.format(chr(0))),
b'',
re.sub(b'^\[\00',
re.sub(salt.utils.to_bytes(r'^\[{0}'.format(chr(0))),
b'',
re.sub(re.escape(module_policy_data.reg_pol_header.encode('utf-16-le')), b'', policy_filedata))
).split(']['.encode('utf-16-le'))
@ -3859,7 +3859,7 @@ def _checkAllAdmxPolicies(policy_class,
admx_policy,
elements_item,
check_deleted=False)
) + b'(?!\*\*delvals\.)',
) + salt.utils.to_bytes(r'(?!\*\*delvals\.)'),
policy_filedata):
configured_value = _getDataFromRegPolData(_processValueItem(child_item,
child_key,
@ -4061,8 +4061,8 @@ def _regexSearchKeyValueCombo(policy_data, policy_regpath, policy_regkey):
for a policy_regpath and policy_regkey combo
'''
if policy_data:
specialValueRegex = b'(\*\*Del\.|\*\*DelVals\.){0,1}'
_thisSearch = b''.join([b'\[',
specialValueRegex = salt.utils.to_bytes(r'(\*\*Del\.|\*\*DelVals\.){0,1}')
_thisSearch = b''.join([salt.utils.to_bytes(r'\['),
re.escape(policy_regpath),
b'\00;',
specialValueRegex,
@ -4178,7 +4178,7 @@ def _policyFileReplaceOrAppendList(string_list, policy_data):
if not policy_data:
policy_data = b''
# we are going to clean off the special pre-fixes, so we get only the valuename
specialValueRegex = b'(\*\*Del\.|\*\*DelVals\.){0,1}'
specialValueRegex = salt.utils.to_bytes(r'(\*\*Del\.|\*\*DelVals\.){0,1}')
for this_string in string_list:
list_item_key = this_string.split(b'\00;')[0].lstrip(b'[')
list_item_value_name = re.sub(specialValueRegex,
@ -4206,7 +4206,7 @@ def _policyFileReplaceOrAppend(this_string, policy_data, append_only=False):
# we are going to clean off the special pre-fixes, so we get only the valuename
if not policy_data:
policy_data = b''
specialValueRegex = b'(\*\*Del\.|\*\*DelVals\.){0,1}'
specialValueRegex = salt.utils.to_bytes(r'(\*\*Del\.|\*\*DelVals\.){0,1}')
item_key = None
item_value_name = None
data_to_replace = None