diff options
| author | Grégoire ROCHER <gr@enix.org> | 2015-07-02 19:17:48 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-07-02 14:46:16 -0400 |
| commit | c6cce4de38662d49d5eaaf197b62937f6ce25be7 (patch) | |
| tree | 180904a8414e41fe9e323e4053d304fe33d2726e /django/core/serializers/python.py | |
| parent | 7edd912cfbf91e8c7cc8bb742645973b82a9ab5a (diff) | |
| download | django-c6cce4de38662d49d5eaaf197b62937f6ce25be7.tar.gz | |
Fixed #25050 -- Allowed serialization of models with deferred fields.
Diffstat (limited to 'django/core/serializers/python.py')
| -rw-r--r-- | django/core/serializers/python.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index c97ab627a3..55c6292343 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -37,7 +37,8 @@ class Serializer(base.Serializer): self._current = None def get_dump_object(self, obj): - data = OrderedDict([('model', force_text(obj._meta))]) + model = obj._meta.proxy_for_model if obj._deferred else obj.__class__ + data = OrderedDict([('model', force_text(model._meta))]) if not self.use_natural_primary_keys or not hasattr(obj, 'natural_key'): data["pk"] = force_text(obj._get_pk_val(), strings_only=True) data['fields'] = self._current |