From 9d7c05a015a526756a766295565786c83089c90d Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 11 Jul 2016 17:36:12 -0400
Subject: [PATCH] [hotfix] fix py3 compatibility broken by basestring

---
 caravel/viz.py | 2 +-
 setup.py       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/caravel/viz.py b/caravel/viz.py
index 511ab87dc8..4c82afe850 100755
--- 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'])
 
diff --git a/setup.py b/setup.py
index 0f4a694a13..c2b72c0015 100644
--- 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',