fix tests

.travis.yml

@@ -23,7 +23,7 @@ matrix:
     - python: "2.6"
       env: DJANGO=dev
 install:
-  - pip install django==${DJANGO}
+  - pip install django==${DJANGO} Pillow
   - pip install .
 language: python
 python:

jsonate/__init__.py

@@ -1 +1,2 @@
-from jsonate.utils import jsonate
+from jsonate.utils import jsonate
+from . import monkey_patches

jsonate/fields.py

@@ -1,5 +1,8 @@
 from django.db import models
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
 from jsonate.utils import jsonate
 from jsonate.widgets import JsonateWidget
 from jsonate.form_fields import JsonateFormField
@@ -31,6 +34,9 @@ def formfield(self, **kwargs):
         }
         defaults.update(kwargs)
         return super(JsonateField, self).formfield(**defaults)
-
-from south.modelsinspector import add_introspection_rules
-add_introspection_rules([], ["^jsonate\.fields\.JsonateField"])
+
+try:
+    from south.modelsinspector import add_introspection_rules
+    add_introspection_rules([], ["^jsonate\.fields\.JsonateField"])
+except ImportError:
+    pass

jsonate/form_fields.py

@@ -1,6 +1,9 @@
 from django.forms import CharField, ValidationError
 from jsonate.widgets import JsonateWidget
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
 
 
 def JsonateValidator(value):

jsonate/json_encoder.py

@@ -1,6 +1,9 @@
 from datetime import datetime, date
 from decimal import Decimal
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
 from django.db.models.query import QuerySet, ValuesQuerySet
 from django.db.models import Model
 from django.db.models.fields.related import ForeignKey

jsonate/models.py

@@ -1 +1 @@
-import jsonate.monkey_patches #@UnusedImport
+import jsonate.monkey_patches

jsonate/utils.py

@@ -1,4 +1,7 @@
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
 
 from jsonate.json_encoder import JsonateEncoder
 

jsonate/widgets.py

@@ -1,5 +1,8 @@
 from django import forms
-from django.utils import simplejson as json
+try:
+    import json
+except ImportError:
+    from django.utils import simplejson as json
 from jsonate.utils import jsonate
 
 class JsonateWidget(forms.Textarea):

test_project/manage.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
+
 try:
     import settings # Assumed to be in the same directory.
 except ImportError:
@@ -8,4 +8,9 @@
     sys.exit(1)
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    try:
+        from django.core.management import execute_from_command_line 
+        execute_from_command_line()
+    except ImportError:
+        from django.core.management import execute_manager
+        execute_manager(settings)

test_project/settings.py

@@ -7,11 +7,12 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
+SECRET_KEY = "thisIsTotallyASecretJkLolHaHa!1!!1!"
+
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'test_jsonate',
-        'USER': 'root'
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'test_jsonate'
     }
 }