Ticket #13370: django-i18n-pickling.diff

django/utils/functional.py

@@ -147 +147 @@
     the lazy evaluation code is triggered. Results are not memoized; the
     function is evaluated on every access.
     """
-    # When lazy() is called by the __reduce_ex__ machinery to reconstitute the
-    # __proxy__ class it can't call with *args, so the first item will just be
-    # a tuple.
-    if len(resultclasses) == 1 and isinstance(resultclasses[0], tuple):
-        resultclasses = resultclasses[0]
 
     class __proxy__(Promise):
         """
@@ -168 +163 @@
             if self.__dispatch is None:
                 self.__prepare_class__()
 
-        def __reduce_ex__(self, protocol):
-            return (lazy, (self.__func, resultclasses), self.__dict__)
+        def __reduce__(self):
+            return (
+                lazy_proxy_unpickle,
+                (self.__func, self.__args, self.__kw) + resultclasses
+            )
 
         def __prepare_class__(cls):
             cls.__dispatch = {}
@@ -249 +247 @@
 
     return wraps(func)(__wrapper__)
 
+def lazy_proxy_unpickle(func, args, kwargs, *resultclasses):
+    return lazy(func, *resultclasses)(*args, **kwargs)
+
 def allow_lazy(func, *resultclasses):
     """
     A decorator that allows a function to be called with one or more lazy

tests/regressiontests/i18n/tests.py

@@ -1 +1 @@
 # -*- encoding: utf-8 -*-
+import datetime
+import decimal
 import os
 import sys
-import decimal
-import datetime
+import pickle
 
 from django.template import Template, Context
 from django.conf import settings
-from django.utils.formats import get_format, date_format, time_format, localize, localize_input
+from django.utils.formats import (get_format, date_format, time_format, localize,
+    localize_input)
 from django.utils.numberformat import format as nformat
 from django.test import TestCase
-from django.utils.translation import ugettext, ugettext_lazy, activate, deactivate, gettext_lazy, to_locale
+from django.utils.translation import (ugettext, ugettext_lazy, activate,
+    deactivate, gettext_lazy, to_locale)
 
 from forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm
 
@@ -40 +43 @@
         self.assertEqual(True, s == s2)
         s4 = ugettext_lazy('Some other string')
         self.assertEqual(False, s == s4)
+    
+    def test_lazy_pickle(self):
+        s1 = ugettext_lazy("test")
+        self.assertEqual(unicode(s1), "test")
+        s2 = pickle.loads(pickle.dumps(s1))
+        self.assertEqual(unicode(s2), "test")
 
     def test_string_concat(self):
         """