[hotfix] fix py3 compatibility broken by basestring

2016-07-11 17:36:12 -04:00 · 2016-07-11 17:36:12 -04:00 · 9d7c05a015
parent 3c92ba9bd5
commit 9d7c05a015
2 changed files with 2 additions and 1 deletions
--- a/caravel/viz.py
+++ b/caravel/viz.py
@ -1491,7 +1491,7 @@ class WorldMapViz(BaseViz):
        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'])

--- a/setup.py
+++ b/setup.py
@ -31,6 +31,7 @@ setup(
        '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',