diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-05-14 19:42:13 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-05-14 19:42:13 +0000 |
| commit | 57ced2560683f7af0c99971dfaaf9c70fca78506 (patch) | |
| tree | 1130983c1c23993e82a39466f3905a5642769c0d /django/core/serializers/python.py | |
| parent | 36c508d1ed64695f864df70cd5d4d37b0c9e7a01 (diff) | |
unicode: Merged from trunk to [5237].
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/serializers/python.py')
| -rw-r--r-- | django/core/serializers/python.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 29ce6bf9bd..66dbbff335 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -37,7 +37,7 @@ class Serializer(base.Serializer): def handle_fk_field(self, obj, field): related = getattr(obj, field.name) if related is not None: - related = related._get_pk_val() + related = getattr(related, field.rel.field_name) self._current[field.name] = related def handle_m2m_field(self, obj, field): @@ -80,7 +80,10 @@ def Deserializer(object_list, **options): # Handle FK fields elif field.rel and isinstance(field.rel, models.ManyToOneRel): - data[field.attname] = field.rel.to._meta.pk.to_python(field_value) + if field_value: + data[field.attname] = field.rel.to._meta.get_field(field.rel.field_name).to_python(field_value) + else: + data[field.attname] = None # Handle all other fields else: |