summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Clelland <ian@fullfactor.com>2012-09-28 12:57:38 -0700
committerLuke Plant <L.Plant.98@cantab.net>2012-10-26 02:40:19 +0100
commitb430e1db5f26d1de3a5cd0d6eae18603070fdab4 (patch)
tree1ebdeeaa9580578969d120b7b04691d5ff75a04b
parent3deed3239470304a67013b5cdc864a8a2087bacf (diff)
[1.5.x] Properly support pickling of LazyObjects in Python 3.3
Backport of 836cd26d7f3394452f1f5196eb26c99fef128a1a from master
-rw-r--r--django/utils/functional.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 085a8fce59..505931e158 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -293,6 +293,16 @@ class SimpleLazyObject(LazyObject):
self._setup()
return self._wrapped.__dict__
+ # Python 3.3 will call __reduce__ when pickling; these methods are needed
+ # to serialize and deserialize correctly. They are not called in earlier
+ # versions of Python.
+ @classmethod
+ def __newobj__(cls, *args):
+ return cls.__new__(cls, *args)
+
+ def __reduce__(self):
+ return (self.__newobj__, (self.__class__,), self.__getstate__())
+
# Need to pretend to be the wrapped class, for the sake of objects that care
# about this (especially in equality tests)
__class__ = property(new_method_proxy(operator.attrgetter("__class__")))