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

make sure delimiter is basestring for cvsfile

Browse source 
fixes #12062
This commit is contained in:
Brian Coca 2015-08-26 16:36:39 -04:00
parent 0441a7a217
commit b2bfe3502b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ class LookupModule(LookupBase):
try: try:
f = codecs.open(filename, 'r', encoding='utf-8') f = codecs.open(filename, 'r', encoding='utf-8')
creader = csv.reader(f, delimiter=delimiter) creader = csv.reader(f, delimiter=str(delimiter))
for row in creader: for row in creader:
if row[0] == key: if row[0] == key:
@ -70,7 +70,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, paramvals['delimiter'], paramvals['default'], paramvals['col']) var = self.read_csv(lookupfile, key, str(paramvals['delimiter']), 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: