Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed #26212 -- Made forms.FileField and translation.lazy_number() picklable.

Browse Source 
Backport of b59f963ad2a49322725b20fac71661bd49643443 from master
This commit is contained in:
Tim Graham 2016-02-15 11:46:12 -05:00
parent 927f43ea3a
commit 180d4cbfe6
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,8 @@ def lazy_number(func, resultclass, number=None, **kwargs):
kwargs['number'] = number kwargs['number'] = number
proxy = lazy(func, resultclass)(**kwargs) proxy = lazy(func, resultclass)(**kwargs)
else: else:
original_kwargs = kwargs.copy()
class NumberAwareString(resultclass): class NumberAwareString(resultclass):
def __mod__(self, rhs): def __mod__(self, rhs):
if isinstance(rhs, dict) and number: if isinstance(rhs, dict) and number:
@ -127,9 +129,14 @@ def lazy_number(func, resultclass, number=None, **kwargs):
return translated return translated
proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs) proxy = lazy(lambda **kwargs: NumberAwareString(), NumberAwareString)(**kwargs)
proxy.__reduce__ = lambda: (_lazy_number_unpickle, (func, resultclass, number, original_kwargs))
return proxy 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): def ngettext_lazy(singular, plural, number=None):
return lazy_number(ngettext, str, singular=singular, plural=plural, number=number) return lazy_number(ngettext, str, singular=singular, plural=plural, number=number)

3
docs/releases/1.8.10.txt
View File

@ -14,3 +14,6 @@ Bugfixes
* Added system checks for query name clashes of hidden relationships * Added system checks for query name clashes of hidden relationships
(:ticket:`26162`). (:ticket:`26162`).
* Made ``forms.FileField`` and ``utils.translation.lazy_number()`` picklable
(:ticket:`26212`).

3
tests/forms_tests/tests/test_fields.py
View File

@ -788,6 +788,9 @@ class FieldsTests(SimpleTestCase):
# with here) # with here)
self.assertTrue(f.has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'})) self.assertTrue(f.has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'}))
def test_file_picklable(self):
self.assertIsInstance(pickle.loads(pickle.dumps(FileField())), FileField)
# ImageField ################################################################## # ImageField ##################################################################
@skipIf(Image is None, "Pillow is required to test ImageField") @skipIf(Image is None, "Pillow is required to test ImageField")

8
tests/i18n/tests.py
View File

@ -229,6 +229,14 @@ class TranslationTests(TestCase):
) )
self.assertEqual(result % {'name': 'Joe', 'num': 4}, "Joe has 4 good results") self.assertEqual(result % {'name': 'Joe', 'num': 4}, "Joe has 4 good results")
def test_ungettext_lazy_pickle(self):
s1 = ungettext_lazy('%d good result', '%d good results')
self.assertEqual(s1 % 1, '1 good result')
self.assertEqual(s1 % 8, '8 good results')
s2 = pickle.loads(pickle.dumps(s1))
self.assertEqual(s2 % 1, '1 good result')
self.assertEqual(s2 % 8, '8 good results')
@override_settings(LOCALE_PATHS=extended_locale_paths) @override_settings(LOCALE_PATHS=extended_locale_paths)
def test_pgettext(self): def test_pgettext(self):
trans_real._active = local() trans_real._active = local()