Changeset 5344

Timestamp:

05/26/07 01:39:10 (1 year ago)

Author:

mtredinnick

Message:

unicode: Fixed proxy.str() handling. So gettext_lazy() will work more
naturally now.

Files:

• django/branches/unicode/django/utils/functional.py (modified) (2 diffs)

django/branches/unicode/django/utils/functional.py

@@ -34 +34 @@
-                    setattr(self, k, self.__promise__(resultclass, k, v))
-            if unicode in resultclasses:
-
+
+
-
-        def __promise__(self, klass, funcname, func):
@@ -52 +53 @@
-        def __unicode_cast(self):
-            return self.__func(*self.__args, **self.__kw)
+
+        def __str__(self):
+            # As __str__ is always a method on the type (class), it is looked
+            # up (and found) there first. So we can't just assign to it on a
+            # per-instance basis in __init__.
+            if self._delegate_str:
+                return str(self.__func(*self.__args, **self.__kw))
+            else:
+                return Promise.__str__(self)
-
-    def __wrapper__(*args, **kw):