Commit 03486620 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.6.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input 

Thanks ygbo for the report.
Backport of 142c2721 from master.
parent b97b2488

django/utils/translation/trans_real.py

+2 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ def pgettext(context, message): 
    result = ugettext(msg_with_ctxt)

    if CONTEXT_SEPARATOR in result:

        # Translation not found

        result = message

        # force unicode, because lazy version expects unicode

        result = force_text(message)

    return result



def gettext_noop(message):

docs/releases/1.6.5.txt

+3 −0
Original line number Diff line number Diff line
@@ -11,3 +11,6 @@ Bugfixes 


* Made the ``year_lookup_bounds_for_datetime_field`` Oracle backend method

  Python 3 compatible (`#22551 <http://code.djangoproject.com/ticket/22551>`_).



* Fixed ``pgettext_lazy`` crash when receiving bytestring content on Python 2

  (`#22565 <http://code.djangoproject.com/ticket/22565>`_).

tests/i18n/tests.py

+15 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ from django.utils.translation import (activate, deactivate, 
    pgettext, pgettext_lazy,

    npgettext, npgettext_lazy,

    check_for_language)

from django.utils.unittest import skipUnless



if find_command('xgettext'):

    from .commands.extraction import (ExtractorTests, BasicExtractorTests,
@@ -88,9 +89,20 @@ class TranslationTests(TransRealMixin, TestCase): 
        s4 = ugettext_lazy('Some other string')

        self.assertEqual(False, s == s4)



        if six.PY2:

            # On Python 2, gettext_lazy should not transform a bytestring to unicode

    @skipUnless(six.PY2, "No more bytestring translations on PY3")

    def test_lazy_and_bytestrings(self):

        # On Python 2, (n)gettext_lazy should not transform a bytestring to unicode

        self.assertEqual(gettext_lazy(b"test").upper(), b"TEST")

        self.assertEqual((ngettext_lazy(b"%d test", b"%d tests") % 1).upper(), b"1 TEST")



        # Other versions of lazy functions always return unicode

        self.assertEqual(ugettext_lazy(b"test").upper(), "TEST")

        self.assertEqual((ungettext_lazy(b"%d test", b"%d tests") % 1).upper(), "1 TEST")

        self.assertEqual(pgettext_lazy(b"context", b"test").upper(), "TEST")

        self.assertEqual(

            (npgettext_lazy(b"context", b"%d test", b"%d tests") % 1).upper(),

            "1 TEST"

        )



    def test_lazy_pickle(self):

        s1 = ugettext_lazy("test")