From ddae2ecfe42a4135850a435e1eefc79dfecaa062 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 29 May 2007 13:09:48 +0000 Subject: unicode: Merged from trunk up to [5380]. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5381 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/serializers/python.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django/core/serializers/python.py') diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 2eb2beeb48..c0d2efab50 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -38,7 +38,12 @@ class Serializer(base.Serializer): def handle_fk_field(self, obj, field): related = getattr(obj, field.name) if related is not None: - related = getattr(related, field.rel.field_name) + if field.rel.field_name == related._meta.pk.name: + # Related to remote object via primary key + related = related._get_pk_val() + else: + # Related to remote object via other field + related = getattr(related, field.rel.field_name) self._current[field.name] = related def handle_m2m_field(self, obj, field): -- cgit v1.3