Merge pull request rpkilby#85 from bradyoo/south

Setting JSONField as String breaks during South data-migration

Author: bradjasper

jsonfield/fields.py

@@ -72,7 +72,7 @@ def pre_init(self, value, obj):
             # Make sure the primary key actually exists on the object before
             # checking if it's empty. This is a special case for South datamigrations
             # see: https://github.com/bradjasper/django-jsonfield/issues/52
-            if not hasattr(obj, "pk") or obj.pk is not None:
+            if hasattr(obj, "pk") and obj.pk is not None:
                 if isinstance(value, six.string_types):
                     try:
                         return json.loads(value, **self.load_kwargs)