2+3 ox.django

ox/django/fields.py

@@ -5,6 +5,7 @@ import datetime
 
 from django.db import models
 from django.utils import datetime_safe
+from six import string_types
 
 from ox.utils import json
 
@@ -66,7 +67,7 @@ class DictField(models.TextField):
         """Convert our JSON object to a string before we save"""
         if value == None:
             return value
-        if isinstance(value, basestring):
+        if isinstance(value, string_types):
             value = eval(value)
         assert isinstance(value, dict)
         value = json.dumps(value, default=to_json)
@@ -92,7 +93,7 @@ class TupleField(models.TextField):
 
     def get_db_prep_save(self, value, connection):
         """Convert our JSON object to a string before we save"""
-        if isinstance(value, basestring):
+        if isinstance(value, string_types):
             value = eval(value)
             if isinstance(value, list):
                 value = tuple(value)