ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Replace - workaround for non-utf8 text (#24861)

Browse source 
* Workaround for non-utf8 text exceptions
* Added encoding param, using to convert from bytes to text and back

Fixes ansible/ansible#24521
This commit is contained in:
Evan Kaufman 2017-06-05 19:35:18 -07:00 committed by Toshio Kuratomi
parent bc4a8dbaa4
commit 49fe53266f
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/modules/files/replace.py
View file

@ -168,7 +168,7 @@ def write_changes(module, contents, path):
tmpfd, tmpfile = tempfile.mkstemp() tmpfd, tmpfile = tempfile.mkstemp()
f = os.fdopen(tmpfd,'wb') f = os.fdopen(tmpfd,'wb')
f.write(to_bytes(contents)) f.write(contents)
f.close() f.close()
validate = module.params.get('validate', None) validate = module.params.get('validate', None)
@ -208,6 +208,7 @@ def main():
before=dict(required=False), before=dict(required=False),
backup=dict(default=False, type='bool'), backup=dict(default=False, type='bool'),
validate=dict(default=None, type='str'), validate=dict(default=None, type='str'),
encoding=dict(default='utf-8', type='str'),
), ),
add_file_common_args=True, add_file_common_args=True,
supports_check_mode=True supports_check_mode=True
@ -215,8 +216,14 @@ def main():
params = module.params params = module.params
path = params['path'] path = params['path']
encoding = params['encoding']
res_args = dict() res_args = dict()
params['after'] = to_text(params['after'], errors='surrogate_or_strict', nonstring='passthru')
params['before'] = to_text(params['before'], errors='surrogate_or_strict', nonstring='passthru')
params['regexp'] = to_text(params['regexp'], errors='surrogate_or_strict', nonstring='passthru')
params['replace'] = to_text(params['replace'], errors='surrogate_or_strict', nonstring='passthru')
if os.path.isdir(path): if os.path.isdir(path):
module.fail_json(rc=256, msg='Path %s is a directory !' % path) module.fail_json(rc=256, msg='Path %s is a directory !' % path)
@ -224,16 +231,16 @@ def main():
module.fail_json(rc=257, msg='Path %s does not exist !' % path) module.fail_json(rc=257, msg='Path %s does not exist !' % path)
else: else:
f = open(path, 'rb') f = open(path, 'rb')
contents = to_text(f.read(), errors='surrogate_or_strict') contents = to_text(f.read(), errors='surrogate_or_strict', encoding=encoding)
f.close() f.close()
pattern = '' pattern = u''
if params['after']: if params['after'] and params['before']:
pattern = '%s(.*)' % params['after'] pattern = u'%s(.*?)%s' % (params['before'], params['after'])
elif params['after']:
pattern = u'%s(.*)' % params['after']
elif params['before']: elif params['before']:
pattern = '(.*)%s' % params['before'] pattern = u'(.*)%s' % params['before']
elif params['after'] and params['before']:
pattern = '%s(.*?)%s' % (params['before'], params['after'])
if pattern: if pattern:
section_re = re.compile(pattern, re.DOTALL) section_re = re.compile(pattern, re.DOTALL)
@ -269,7 +276,7 @@ def main():
res_args['backup_file'] = module.backup_local(path) res_args['backup_file'] = module.backup_local(path)
if params['follow'] and os.path.islink(path): if params['follow'] and os.path.islink(path):
path = os.path.realpath(path) path = os.path.realpath(path)
write_changes(module, result[0], path) write_changes(module, to_bytes(result[0], encoding=encoding), path)
res_args['msg'], res_args['changed'] = check_file_attrs(module, changed, msg) res_args['msg'], res_args['changed'] = check_file_attrs(module, changed, msg)
module.exit_json(**res_args) module.exit_json(**res_args)