From b3e42feea958452f49f1e611e789f7085051869b Mon Sep 17 00:00:00 2001 From: Brad Jasper Date: Mon, 22 Dec 2014 14:21:18 -0500 Subject: [PATCH] Revert "Fix JSONfield for inherited models" --- jsonfield/fields.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jsonfield/fields.py b/jsonfield/fields.py index 65c9c6a..d3ce732 100644 --- a/jsonfield/fields.py +++ b/jsonfield/fields.py @@ -69,15 +69,10 @@ def pre_init(self, value, obj): deserialized""" if obj._state.adding: - meta_pk = obj._meta.pk - if isinstance(meta_pk, models.OneToOneField): - real_pk_name = meta_pk.related_field.name - else: - real_pk_name = meta_pk.name # 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 getattr(obj, real_pk_name, None) is not None: + if getattr(obj, "pk", None) is not None: if isinstance(value, six.string_types): try: return json.loads(value, **self.load_kwargs)