Merge "Replace basestring with six.string_types"

distil/api/helpers.py

@@ -13,9 +13,12 @@
 #    under the License.
 
 from decorator import decorator
+import json
+
 import flask
 import itertools
-import json
+import six
+
 from distil.models import Tenant
 from distil import config
 
@@ -81,7 +84,7 @@ def validate_tenant_id(tenant_id, session):
     """Tenant ID validation that check that the id you passed is valid,
        and that a tenant with this ID exists.
        - returns tenant query, or a tuple if validation failure."""
-    if isinstance(tenant_id, basestring):
+    if isinstance(tenant_id, six.string_types):
         tenant_query = session.query(Tenant).\
             filter(Tenant.id == tenant_id)
         if tenant_query.count() == 0: