cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pre-load whole string and use seek to alter tags

Browse source
This commit is contained in:
Marcus Cobden 2014-08-11 09:07:21 +01:00
parent c8bfd157f8
commit c47d1f5265
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/utils/__init__.py
View file

@ -366,23 +366,21 @@ def _clean_data(orig_data, from_remote=False, from_inventory=False):
regex = PRINT_CODE_REGEX if replace_prints else CODE_REGEX regex = PRINT_CODE_REGEX if replace_prints else CODE_REGEX
with contextlib.closing(StringIO.StringIO()) as data: with contextlib.closing(StringIO.StringIO(orig_data)) as data:
# these variables keep track of opening block locations, as we only # these variables keep track of opening block locations, as we only
# want to replace matched pairs of print/block tags # want to replace matched pairs of print/block tags
last_pos = 0
print_openings = [] print_openings = []
block_openings = [] block_openings = []
for mo in regex.finditer(orig_data): for mo in regex.finditer(orig_data):
token = mo.group(0) token = mo.group(0)
token_start = mo.start(0) token_start = mo.start(0)
token_end = mo.end(0)
if token[0] == '{': if token[0] == '{':
if token == '{%': if token == '{%':
block_openings.append(token_start) block_openings.append(token_start)
elif token == '{{': elif token == '{{':
print_openings.append(token_start) print_openings.append(token_start)
data.write(orig_data[last_pos:token_end])
elif token[1] == '}': elif token[1] == '}':
prev_idx = None prev_idx = None
if token == '%}' and block_openings: if token == '%}' and block_openings:
@ -390,21 +388,16 @@ def _clean_data(orig_data, from_remote=False, from_inventory=False):
elif token == '}}' and print_openings: elif token == '}}' and print_openings:
prev_idx = print_openings.pop() prev_idx = print_openings.pop()
data.write(orig_data[last_pos:token_start])
if prev_idx is not None: if prev_idx is not None:
# replace the opening # replace the opening
data.seek(prev_idx, os.SEEK_SET) data.seek(prev_idx, os.SEEK_SET)
data.write('{#') data.write('{#')
# replace the closing # replace the closing
data.seek(0, os.SEEK_END) data.seek(token_start, os.SEEK_SET)
data.write('#}') data.write('#}')
else:
data.write(token)
else: else:
assert False, 'Unhandled regex match' assert False, 'Unhandled regex match'
last_pos = token_end
data.write(orig_data[last_pos:])
return data.getvalue() return data.getvalue()