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

update to use a single line if statement when dealing with prepended

Browse source 
text

add comment on using +2
This commit is contained in:
lomeroe 2018-11-02 08:00:44 -05:00
parent 0e011ad805
commit dc58252e52
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/modules/win_lgpo.py
View file

@ -3094,15 +3094,9 @@ def _getAdmlPresentationRefId(adml_data, ref_id):
else:
if etree.QName(p_item.tag).localname == 'text':
if prepended_text:
if getattr(p_item, 'text', ''):
prepended_text = ' '.join([prepended_text, getattr(p_item, 'text', '').rstrip()])
else:
prepended_text = ''
prepended_text = ' '.join((text for text in (prepended_text, getattr(p_item, 'text', '').rstrip()) if text))
else:
if getattr(p_item, 'text', ''):
prepended_text = getattr(p_item, 'text', '').rstrip()
else:
prepended_text = ''
prepended_text = getattr(p_item, 'text', '').rstrip()
else:
prepended_text = ''
if prepended_text.endswith('.'):
@ -4185,6 +4179,8 @@ def _regexSearchKeyValueCombo(policy_data, policy_regpath, policy_regkey):
b'\00;'])
match = re.search(_thisSearch, policy_data, re.IGNORECASE)
if match:
# add 2 so we get the ']' and the \00
# to return the full policy entry
return policy_data[match.start():(policy_data.index(b']', match.end())) + 2]
return None