mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #26212 -- Made forms.FileField and translation.lazy_number() picklable.

Browse Source
This commit is contained in:
Alexey Kotlyarov
2016-02-12 12:12:54 +11:00
committed by Tim Graham
parent 1ac7fdcd13
commit b59f963ad2
5 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/translation/__init__.py
View File

@@ -106,6 +106,8 @@ def lazy_number(func, resultclass, number=None, **kwargs):
kwargs['number'] = number
proxy = lazy(func, resultclass)(**kwargs)
else:
original_kwargs = kwargs.copy()
class NumberAwareString(resultclass):
def __bool__(self):
return bool(kwargs['singular'])
@@ -134,9 +136,14 @@ def lazy_number(func, resultclass, number=None, **kwargs):
return translated
proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs)
proxy.__reduce__ = lambda: (_lazy_number_unpickle, (func, resultclass, number, original_kwargs))
return proxy
def _lazy_number_unpickle(func, resultclass, number, kwargs):
return lazy_number(func, resultclass, number=number, **kwargs)
def ngettext_lazy(singular, plural, number=None):
return lazy_number(ngettext, str, singular=singular, plural=plural, number=number)