diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-11-10 15:42:40 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2006-11-10 15:42:40 +0000 |
| commit | 889bf502818df7cbf8332a330703ff97dce01f2d (patch) | |
| tree | 0480275012190083544debebb212499b7788b226 /django/core/serializers/python.py | |
| parent | 16e873e32b73c286ebdd4fd0050dc9229f2809a8 (diff) | |
[generic-auth] Merged to [4062]
git-svn-id: http://code.djangoproject.com/svn/django/branches/generic-auth@4063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core/serializers/python.py')
| -rw-r--r-- | django/core/serializers/python.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 4181bc7f2b..859816c226 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -76,7 +76,7 @@ def Deserializer(object_list, **options): m2m_data[field.name] = field.rel.to._default_manager.in_bulk(field_value).values() # Handle FK fields - elif field.rel and isinstance(field.rel, models.ManyToOneRel): + elif field.rel and isinstance(field.rel, models.ManyToOneRel) and field_value is not None: try: data[field.name] = field.rel.to._default_manager.get(pk=field_value) except field.rel.to.DoesNotExist: |