[1.1.X] Fixed #12060 - equality tests between User and SimpleLazyObject-wrapped User failed.

  
Also added more tests for SimpleLazyObject
  
Thanks to ericholscher for report.

Backport of r11637 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11638 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 22 insertions, 1 deletions

diff --git a/django/utils/functional.py b/django/utils/functional.py
index 52969cd43a..65a9b9d7aa 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -312,14 +312,35 @@ class SimpleLazyObject(LazyObject):
         if self._wrapped is None: self._setup()
         return str(self._wrapped)
 
+    def __unicode__(self):
+        if self._wrapped is None: self._setup()
+        return unicode(self._wrapped)
+
     def __deepcopy__(self, memo):
         if self._wrapped is None:
-            result = self.__class__(self._setupfunc)
+            # We have to use SimpleLazyObject, not self.__class__, because the
+            # latter is proxied.
+            result = SimpleLazyObject(self._setupfunc)
             memo[id(self)] = result
             return result
         else:
             import copy
             return copy.deepcopy(self._wrapped, memo)
 
+    # Need to pretend to be the wrapped class, for the sake of objects that care
+    # about this (especially in equality tests)
+    def __get_class(self):
+        if self._wrapped is None: self._setup()
+        return self._wrapped.__class__
+    __class__ = property(__get_class)
+
+    def __eq__(self, other):
+        if self._wrapped is None: self._setup()
+        return self._wrapped == other
+
+    def __hash__(self):
+        if self._wrapped is None: self._setup()
+        return hash(self._wrapped)
+
     def _setup(self):
         self._wrapped = self._setupfunc()