Changeset 6276

Timestamp:

09/15/07 05:57:03 (1 year ago)

Author:

mtredinnick

Message:

Fixed #5487 -- Added deepcopying ability to lazy() objects, along with a test to demonstrate why the previous code failed. Debugging and patch from John Buchanan.

Files:

• django/trunk/django/utils/functional.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/regressions.py (modified) (1 diff)

django/trunk/django/utils/functional.py

@@ +1 @@
+import copy
+
-def curry(_curried_func, *args, **kwargs):
-    def _curried(*moreargs, **morekwargs):
@@ -102 +104 @@
-                raise AssertionError('__mod__ not supported for non-string types')
-
+        def __deepcopy__(self, memo):
+            result = copy.copy(self)
+            memo[id(self)] = result
+            return result
+
-    def __wrapper__(*args, **kw):
-        # Creates the proxy object, instead of the actual value.

django/trunk/tests/regressiontests/forms/regressions.py

@@ -61 +61 @@
->>> deactivate()
-
+Deep copying translated text shouldn't raise an error
+>>> from django.utils.translation import gettext_lazy
+>>> class CopyForm(Form):
+...     degree = IntegerField(widget=Select(choices=((1, gettext_lazy('test')),)))
+>>> f = CopyForm()
+
-#######################
-# Miscellaneous Tests #