summaryrefslogtreecommitdiff
path: root/django/core/serializers/python.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2008-08-12 12:58:33 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2008-08-12 12:58:33 +0000
commit63ea57642dd980ff07627964efd445986bc9fe58 (patch)
treef385b7587e4b207fd4351be6447843d24f41b552 /django/core/serializers/python.py
parentdd970bfbfd3bd9a4954ae3bc0879842198903742 (diff)
Fixed #8134 -- Corrected serialization of m2m fields with intermediate models. Thanks to Rock Howard for the report, and kire for the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/serializers/python.py')
-rw-r--r--django/core/serializers/python.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py
index cedab06be9..c129c068df 100644
--- a/django/core/serializers/python.py
+++ b/django/core/serializers/python.py
@@ -49,8 +49,9 @@ class Serializer(base.Serializer):
self._current[field.name] = smart_unicode(related, strings_only=True)
def handle_m2m_field(self, obj, field):
- self._current[field.name] = [smart_unicode(related._get_pk_val(), strings_only=True)
- for related in getattr(obj, field.name).iterator()]
+ if field.creates_table:
+ self._current[field.name] = [smart_unicode(related._get_pk_val(), strings_only=True)
+ for related in getattr(obj, field.name).iterator()]
def getvalue(self):
return self.objects