python3: use six.string_types to check for strings

combo/apps/assets/templatetags/assets.py

@@ -16,6 +16,7 @@
 
 from django import template
 from django.db.models.fields.files import ImageFieldFile
+from django.utils import six
 
 from sorl.thumbnail.shortcuts import get_thumbnail
 
@@ -36,7 +37,7 @@ def asset_url(*args, **kwargs):
             asset = asset_object
             break
 
-        if isinstance(asset_object, basestring):
+        if isinstance(asset_object, six.string_types):
             try:
                 asset = Asset.objects.get(key=asset_object).asset
                 break

combo/apps/maps/models.py

@@ -18,6 +18,7 @@ import json
 
 from django.core import serializers
 from django.db import models
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
@@ -206,7 +207,7 @@ class MapLayer(models.Model):
 
             def match(feature):
                 for geo_property in feature['properties'].values():
-                    if not isinstance(geo_property, basestring):
+                    if not isinstance(geo_property, six.string_types):
                         continue
                     if query in slugify(geo_property):
                         return True

combo/data/models.py

@@ -359,14 +359,14 @@ class Page(models.Model):
     @classmethod
     def load_serialized_page(cls, json_page, snapshot=None):
         json_page['model'] = 'data.page'
-        json_page['fields']['groups'] = [[x] for x in json_page['fields']['groups'] if isinstance(x, basestring)]
+        json_page['fields']['groups'] = [[x] for x in json_page['fields']['groups'] if isinstance(x, six.string_types)]
         page, created = Page.objects.get_or_create(slug=json_page['fields']['slug'], snapshot=snapshot)
         json_page['pk'] = page.id
         page = [x for x in serializers.deserialize('json', json.dumps([json_page]))][0]
         page.object.snapshot = snapshot
         page.save()
         for cell in json_page.get('cells'):
-            cell['fields']['groups'] = [[x] for x in cell['fields']['groups'] if isinstance(x, basestring)]
+            cell['fields']['groups'] = [[x] for x in cell['fields']['groups'] if isinstance(x, six.string_types)]
             if snapshot:
                 cell['fields']['page'] = page.object.id
             else:

combo/data/utils.py

@@ -16,6 +16,7 @@
 
 from django.contrib.auth.models import Group
 from django.db import transaction
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
@@ -53,10 +54,10 @@ def import_site(data, if_empty=False, clean=False):
     groups = set()
     for page in data.get('pages') or []:
         for group in page['fields']['groups']:
-            groups.add(group if isinstance(group, basestring) else group[0])
+            groups.add(group if isinstance(group, six.string_types) else group[0])
         for cell in page['cells']:
             for group in cell['fields']['groups']:
-                groups.add(group if isinstance(group, basestring) else group[0])
+                groups.add(group if isinstance(group, six.string_types) else group[0])
 
     existing_groups = set([x.name for x in Group.objects.filter(name__in=groups)])
     missing_groups = groups - existing_groups