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

Encoding fixes to support py2 and py3 non-ascii data

Browse source 
Fixes #58418

Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
This commit is contained in:
Martin Krizek 2019-06-27 10:24:02 +02:00 committed by Matt Clay
parent 18f9595719
commit de8ac79832
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/files/read_csv.py
View file

@ -142,9 +142,11 @@ list:
''' '''
import csv import csv
from io import BytesIO, StringIO
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.six import PY3
# Add Unix dialect from Python 3 # Add Unix dialect from Python 3
@ -201,11 +203,19 @@ def main():
dialect = 'custom' dialect = 'custom'
try: try:
f = open(path, 'r') with open(path, 'rb') as f:
data = f.read()
except (IOError, OSError) as e: except (IOError, OSError) as e:
module.fail_json(msg="Unable to open file: %s" % to_text(e)) module.fail_json(msg="Unable to open file: %s" % to_text(e))
reader = csv.DictReader(f, fieldnames=fieldnames, dialect=dialect) if PY3:
# Manually decode on Python3 so that we can use the surrogateescape error handler
data = to_text(data, errors='surrogate_or_strict')
fake_fh = StringIO(data)
else:
fake_fh = BytesIO(data)
reader = csv.DictReader(fake_fh, fieldnames=fieldnames, dialect=dialect)
if key and key not in reader.fieldnames: if key and key not in reader.fieldnames:
module.fail_json(msg="Key '%s' was not found in the CSV header fields: %s" % (key, ', '.join(reader.fieldnames))) module.fail_json(msg="Key '%s' was not found in the CSV header fields: %s" % (key, ', '.join(reader.fieldnames)))