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

Use to_bytes and to_str instead of str as str is unsafe.

Browse source
This commit is contained in:
Toshio Kuratomi 2016-04-04 12:57:32 -07:00
parent 83367dc52f
commit c75b5ba85f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/lookup/csvfile.py
View file

@ -22,6 +22,7 @@ import csv
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
from ansible.utils.unicode import to_bytes, to_str, to_unicode
class CSVRecoder: class CSVRecoder:
""" """
@ -48,7 +49,7 @@ class CSVReader:
def next(self): def next(self):
row = self.reader.next() row = self.reader.next()
return [unicode(s, 'utf-8') for s in row] return [to_unicode(s) for s in row]
def __iter__(self): def __iter__(self):
return self return self
@ -59,13 +60,13 @@ class LookupModule(LookupBase):
try: try:
f = open(filename, 'r') f = open(filename, 'r')
creader = CSVReader(f, delimiter=str(delimiter), encoding=encoding) creader = CSVReader(f, delimiter=to_bytes(delimiter), encoding=encoding)
for row in creader: for row in creader:
if row[0] == key: if row[0] == key:
return row[int(col)] return row[int(col)]
except Exception as e: except Exception as e:
raise AnsibleError("csvfile: %s" % str(e)) raise AnsibleError("csvfile: %s" % to_str(e))
return dflt return dflt
@ -100,7 +101,7 @@ class LookupModule(LookupBase):
paramvals['delimiter'] = "\t" paramvals['delimiter'] = "\t"
lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file']) lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file'])
var = self.read_csv(lookupfile, key, str(paramvals['delimiter']), paramvals['encoding'], paramvals['default'], paramvals['col']) var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['encoding'], paramvals['default'], paramvals['col'])
if var is not None: if var is not None:
if type(var) is list: if type(var) is list:
for v in var: for v in var: