aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorYuri Prezument2013-08-31 17:20:49 +0300
committerYuri Prezument2013-08-31 17:20:49 +0300
commit745ebeca77e6bcbec4eb94fb98206d6913e3d049 (patch)
treefb8d461268e19f1c6b218e914776c74e0cb535eb /rest_framework
parenta15cda4be4e14f5de5db41a4f664ee95107e0984 (diff)
downloaddjango-rest-framework-745ebeca77e6bcbec4eb94fb98206d6913e3d049.tar.bz2
Handle case where obj=None in PKRelatedField.field_to_native()
Fixes #1072
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/relations.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 3ad16ee5..35c00bf1 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -264,7 +264,7 @@ class PrimaryKeyRelatedField(RelatedField):
# RelatedObject (reverse relationship)
try:
pk = getattr(obj, self.source or field_name).pk
- except ObjectDoesNotExist:
+ except (ObjectDoesNotExist, AttributeError):
return None
# Forward relationship