mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #28575 -- Made RelatedObjectDoesNotExist classes pickable.

Browse Source 
Thanks to Rachel Tobin for the initial __qualname__ work and tests.
This commit is contained in:
Simon Charette
2017-10-18 21:43:53 -04:00
committed by Tim Graham
parent 4a861e8850
commit d4fb742094
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
django/db/models/fields/related_descriptors.py
View File

@@ -92,8 +92,13 @@ class ForwardManyToOneDescriptor:
# still be a string model reference.
return type(
'RelatedObjectDoesNotExist',
(self.field.remote_field.model.DoesNotExist, AttributeError),
{}
(self.field.remote_field.model.DoesNotExist, AttributeError), {
'__module__': self.field.model.__module__,
'__qualname__': '%s.%s.RelatedObjectDoesNotExist' % (
self.field.model.__qualname__,
self.field.name,
),
}
)
def is_cached(self, instance):
@@ -244,6 +249,14 @@ class ForwardManyToOneDescriptor:
if value is not None and not remote_field.multiple:
remote_field.set_cached_value(value, instance)
def __reduce__(self):
"""
Pickling should return the instance attached by self.field on the
model, not a new copy of that descriptor. Use getattr() to retrieve
the instance directly from the model.
"""
return getattr, (self.field.model, self.field.name)
class ForwardOneToOneDescriptor(ForwardManyToOneDescriptor):
"""
@@ -317,8 +330,13 @@ class ReverseOneToOneDescriptor:
# consistency with `ForwardManyToOneDescriptor`.
return type(
'RelatedObjectDoesNotExist',
(self.related.related_model.DoesNotExist, AttributeError),
{}
(self.related.related_model.DoesNotExist, AttributeError), {
'__module__': self.related.model.__module__,
'__qualname__': '%s.%s.RelatedObjectDoesNotExist' % (
self.related.model.__qualname__,
self.related.name,
)
},
)
def is_cached(self, instance):
@@ -455,6 +473,10 @@ class ReverseOneToOneDescriptor:
# instance to avoid an extra SQL query if it's accessed later on.
self.related.field.set_cached_value(value, instance)
def __reduce__(self):
# Same purpose as ForwardManyToOneDescriptor.__reduce__().
return getattr, (self.related.model, self.related.name)
class ReverseManyToOneDescriptor:
"""