Author: lukeplant
Date: 2011-12-14 18:33:14 -0800 (Wed, 14 Dec 2011)
New Revision: 17202
Modified:
django/trunk/django/utils/functional.py
django/trunk/tests/regressiontests/utils/simplelazyobject.py
Log:
Fixed #16563 - Error pickling request.user
Thanks to zero.fuxor for the report
Modified: django/trunk/django/utils/functional.py
===================================================================
--- django/trunk/django/utils/functional.py 2011-12-14 14:49:00 UTC (rev
17201)
+++ django/trunk/django/utils/functional.py 2011-12-15 02:33:14 UTC (rev
17202)
@@ -261,6 +261,16 @@
else:
return copy.deepcopy(self._wrapped, memo)
+ # Because we have messed with __class__ below, we confuse pickle as to what
+ # class we are pickling. It also appears to stop __reduce__ from being
+ # called. So, we define __getstate__ in a way that cooperates with the way
+ # that pickle interprets this class. This fails when the wrapped class is
a
+ # builtin, but it is better than nothing.
+ def __getstate__(self):
+ if self._wrapped is empty:
+ self._setup()
+ return self._wrapped.__dict__
+
# 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__")))
Modified: django/trunk/tests/regressiontests/utils/simplelazyobject.py
===================================================================
--- django/trunk/tests/regressiontests/utils/simplelazyobject.py
2011-12-14 14:49:00 UTC (rev 17201)
+++ django/trunk/tests/regressiontests/utils/simplelazyobject.py
2011-12-15 02:33:14 UTC (rev 17202)
@@ -1,4 +1,5 @@
import copy
+import pickle
from django.utils.unittest import TestCase
from django.utils.functional import SimpleLazyObject, empty
@@ -96,3 +97,12 @@
self.assertTrue(x)
x = SimpleLazyObject(lambda: 0)
self.assertFalse(x)
+
+ def test_pickle_complex(self):
+ # See ticket #16563
+ x = SimpleLazyObject(complex_object)
+ pickled = pickle.dumps(x)
+ unpickled = pickle.loads(pickled)
+ self.assertEqual(unpickled, x)
+ self.assertEqual(unicode(unpickled), unicode(x))
+ self.assertEqual(unpickled.name, x.name)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
