Browse code

make sure delimiter is basestring for cvsfile fixes #12062

Brian Coca authored on 2015/08/27 05:36:39
Showing 1 changed files
... ...
@@ -30,7 +30,7 @@ class LookupModule(LookupBase):
30 30
 
31 31
         try:
32 32
             f = codecs.open(filename, 'r', encoding='utf-8')
33
-            creader = csv.reader(f, delimiter=delimiter)
33
+            creader = csv.reader(f, delimiter=str(delimiter))
34 34
 
35 35
             for row in creader:
36 36
                 if row[0] == key:
... ...
@@ -70,7 +70,7 @@ class LookupModule(LookupBase):
70 70
                 paramvals['delimiter'] = "\t"
71 71
 
72 72
             lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file'])
73
-            var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['default'], paramvals['col'])
73
+            var = self.read_csv(lookupfile, key, str(paramvals['delimiter']), paramvals['default'], paramvals['col'])
74 74
             if var is not None:
75 75
                 if type(var) is list:
76 76
                     for v in var: