Fixed incompatibility with django-1.9

Author: nnseva

jsoneditor/forms.py

@@ -1,5 +1,8 @@
 from django.forms.widgets import Textarea
-from django.forms.util import flatatt
+try:
+    from django.forms.util import flatatt
+except ImportError:
+    from django.forms.utils import flatatt
 
 from django.utils.safestring import mark_safe
 

testapp/migrations/0001_initial.py

@@ -3,7 +3,7 @@
 
 from django.db import models, migrations
 import jsoneditor.fields.django_jsonfield
-import jsoneditor.fields.django_json_field
+#import jsoneditor.fields.django_json_field
 
 
 class Migration(migrations.Migration):
@@ -16,23 +16,23 @@ class Migration(migrations.Migration):
             name='TestModel',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('test_django_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
+ #               ('test_django_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
                 ('test_django_jsonfield', jsoneditor.fields.django_jsonfield.JSONField(help_text=b'Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield', null=True, verbose_name=b'Test JSON 2', blank=True)),
             ],
         ),
         migrations.CreateModel(
             name='TestSubModel1',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('test_inline_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
+                ('test_inline_json_field', jsoneditor.fields.django_jsonfield.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
                 ('par', models.ForeignKey(to='testapp.TestModel')),
             ],
         ),
         migrations.CreateModel(
             name='TestSubModel2',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('test_inline_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
+                ('test_inline_json_field', jsoneditor.fields.django_jsonfield.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
                 ('par', models.ForeignKey(to='testapp.TestModel')),
             ],
         ),

testapp/models.py

@@ -1,17 +1,17 @@
 from django.db import models
 
-from jsoneditor.fields.django_json_field import JSONField as JSONField1
+#from jsoneditor.fields.django_json_field import JSONField as JSONField1
 from jsoneditor.fields.django_jsonfield import JSONField as JSONField2
 # Create your models here.
 
 class TestModel(models.Model):
-    test_django_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
+#    test_django_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
     test_django_jsonfield = JSONField2(verbose_name="Test JSON 2",null=True,blank=True,help_text="Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield")
 
 class TestSubModel1(models.Model):
     par = models.ForeignKey(TestModel)
-    test_inline_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
+    test_inline_json_field = JSONField2(verbose_name="Test JSON 2",null=True,blank=True,help_text="Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield")
 
 class TestSubModel2(models.Model):
     par = models.ForeignKey(TestModel)
-    test_inline_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
+    test_inline_json_field = JSONField2(verbose_name="Test JSON 2",null=True,blank=True,help_text="Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield")