Commit b2bfe350 by Brian Coca

make sure delimiter is basestring for cvsfile

fixes #12062
parent 0441a7a2
...@@ -30,7 +30,7 @@ class LookupModule(LookupBase): ...@@ -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): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment