[hotfix] fix py3 compatibility broken by basestring

apache · Jul 11, 2016 · 9d7c05a · 9d7c05a
1 parent 3c92ba9
commit 9d7c05a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/caravel/viz.py b/caravel/viz.py
@@ -1491,7 +1491,7 @@ def get_data(self):
         d = df.to_dict(orient='records')
         for row in d:
             country = None
-            if isinstance(row['country'], basestring):
+            if isinstance(row['country'], string_types):
                 country = countries.get(
                     self.form_data.get('country_fieldtype'), row['country'])
 

diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@
         'python-dateutil==2.5.3',
         'requests==2.10.0',
         'simplejson==3.8.2',
+        'six==1.10.0',
         'sqlalchemy==1.0.13',
         'sqlalchemy-utils==0.32.7',
         'sqlparse==0.1.19',