Dropped safeguards against very old versions of gettext.

gettext 0.19 was released in 2014.

3 files changed, 1 insertions, 431 deletions

diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py
index 7da95ba9e9..7b02776dbe 100644
--- a/tests/i18n/test_compilation.py
+++ b/tests/i18n/test_compilation.py
@@ -8,7 +8,6 @@ from subprocess import run
 from unittest import mock
 
 from django.core.management import CommandError, call_command, execute_from_command_line
-from django.core.management.commands.makemessages import Command as MakeMessagesCommand
 from django.core.management.utils import find_command
 from django.test import SimpleTestCase, override_settings
 from django.test.utils import captured_stderr, captured_stdout
@@ -269,9 +268,6 @@ class CompilationErrorHandling(MessageCompilationTests):
             "django.core.management.utils.run",
             lambda *args, **kwargs: run(*args, env=env, **kwargs),
         ):
-            cmd = MakeMessagesCommand()
-            if cmd.gettext_version < (0, 18, 3):
-                self.skipTest("python-brace-format is a recent gettext addition.")
             stderr = StringIO()
             with self.assertRaisesMessage(
                 CommandError, "compilemessages generated one or more errors"
diff --git a/tests/i18n/test_extraction.py b/tests/i18n/test_extraction.py
index 226d51ce11..7aa600c4c1 100644
--- a/tests/i18n/test_extraction.py
+++ b/tests/i18n/test_extraction.py
@@ -6,7 +6,7 @@ import time
 import warnings
 from io import StringIO
 from pathlib import Path
-from unittest import mock, skipIf, skipUnless
+from unittest import mock, skipUnless
 
 from admin_scripts.tests import AdminScriptTestCase
 
@@ -25,10 +25,6 @@ from .utils import POFileAssertionMixin, RunInTmpDirMixin, copytree
 
 LOCALE = "de"
 has_xgettext = find_command("xgettext")
-gettext_version = MakeMessagesCommand().gettext_version if has_xgettext else None
-requires_gettext_019 = skipIf(
-    has_xgettext and gettext_version < (0, 19), "gettext 0.19 required"
-)
 
 
 @skipUnless(has_xgettext, "xgettext is mandatory for extraction tests")
@@ -836,7 +832,6 @@ class LocationCommentsTests(ExtractorTests):
         self.assertLocationCommentNotPresent(self.PO_FILE, None, ".html.py")
         self.assertLocationCommentPresent(self.PO_FILE, 5, "templates", "test.html")
 
-    @requires_gettext_019
     def test_add_location_full(self):
         """makemessages --add-location=full"""
         management.call_command(
@@ -848,7 +843,6 @@ class LocationCommentsTests(ExtractorTests):
             self.PO_FILE, "Translatable literal #6b", "templates", "test.html"
         )
 
-    @requires_gettext_019
     def test_add_location_file(self):
         """makemessages --add-location=file"""
         management.call_command(
@@ -862,7 +856,6 @@ class LocationCommentsTests(ExtractorTests):
             self.PO_FILE, "Translatable literal #6b", "templates", "test.html"
         )
 
-    @requires_gettext_019
     def test_add_location_never(self):
         """makemessages --add-location=never"""
         management.call_command(
@@ -871,24 +864,6 @@ class LocationCommentsTests(ExtractorTests):
         self.assertTrue(os.path.exists(self.PO_FILE))
         self.assertLocationCommentNotPresent(self.PO_FILE, None, "test.html")
 
-    @mock.patch(
-        "django.core.management.commands.makemessages.Command.gettext_version",
-        new=(0, 18, 99),
-    )
-    def test_add_location_gettext_version_check(self):
-        """
-        CommandError is raised when using makemessages --add-location with
-        gettext < 0.19.
-        """
-        msg = (
-            "The --add-location option requires gettext 0.19 or later. You have "
-            "0.18.99."
-        )
-        with self.assertRaisesMessage(CommandError, msg):
-            management.call_command(
-                "makemessages", locale=[LOCALE], verbosity=0, add_location="full"
-            )
-
 
 class NoObsoleteExtractorTests(ExtractorTests):
     work_subdir = "obsolete_translations"
diff --git a/tests/utils_tests/test_jslex.py b/tests/utils_tests/test_jslex.py
deleted file mode 100644
index 59551930c6..0000000000
--- a/tests/utils_tests/test_jslex.py
+++ /dev/null
@@ -1,401 +0,0 @@
-"""Tests for jslex."""
-
-# originally from https://bitbucket.org/ned/jslex
-
-from django.test import SimpleTestCase
-from django.utils.jslex import JsLexer, prepare_js_for_gettext
-
-
-class JsTokensTest(SimpleTestCase):
-    LEX_CASES = [
-        # ids
-        ("a ABC $ _ a123", ["id a", "id ABC", "id $", "id _", "id a123"]),
-        (
-            "\\u1234 abc\\u0020 \\u0065_\\u0067",
-            ["id \\u1234", "id abc\\u0020", "id \\u0065_\\u0067"],
-        ),
-        # numbers
-        (
-            "123 1.234 0.123e-3 0 1E+40 1e1 .123",
-            [
-                "dnum 123",
-                "dnum 1.234",
-                "dnum 0.123e-3",
-                "dnum 0",
-                "dnum 1E+40",
-                "dnum 1e1",
-                "dnum .123",
-            ],
-        ),
-        ("0x1 0xabCD 0XABcd", ["hnum 0x1", "hnum 0xabCD", "hnum 0XABcd"]),
-        ("010 0377 090", ["onum 010", "onum 0377", "dnum 0", "dnum 90"]),
-        ("0xa123ghi", ["hnum 0xa123", "id ghi"]),
-        # keywords
-        (
-            "function Function FUNCTION",
-            ["keyword function", "id Function", "id FUNCTION"],
-        ),
-        (
-            "const constructor in inherits",
-            ["keyword const", "id constructor", "keyword in", "id inherits"],
-        ),
-        ("true true_enough", ["reserved true", "id true_enough"]),
-        # strings
-        (""" 'hello' "hello" """, ["string 'hello'", 'string "hello"']),
-        (
-            r""" 'don\'t' "don\"t" '"' "'" '\'' "\"" """,
-            [
-                r"""string 'don\'t'""",
-                r'''string "don\"t"''',
-                r"""string '"'""",
-                r'''string "'"''',
-                r"""string '\''""",
-                r'''string "\""''',
-            ],
-        ),
-        (r'"ƃuıxǝ⅂ ʇdıɹɔsɐʌɐſ\""', [r'string "ƃuıxǝ⅂ ʇdıɹɔsɐʌɐſ\""']),
-        # comments
-        ("a//b", ["id a", "linecomment //b"]),
-        (
-            "/****/a/=2//hello",
-            ["comment /****/", "id a", "punct /=", "dnum 2", "linecomment //hello"],
-        ),
-        (
-            "/*\n * Header\n */\na=1;",
-            ["comment /*\n * Header\n */", "id a", "punct =", "dnum 1", "punct ;"],
-        ),
-        # punctuation
-        ("a+++b", ["id a", "punct ++", "punct +", "id b"]),
-        # regex
-        (r"a=/a*/,1", ["id a", "punct =", "regex /a*/", "punct ,", "dnum 1"]),
-        (r"a=/a*[^/]+/,1", ["id a", "punct =", "regex /a*[^/]+/", "punct ,", "dnum 1"]),
-        (r"a=/a*\[^/,1", ["id a", "punct =", r"regex /a*\[^/", "punct ,", "dnum 1"]),
-        (r"a=/\//,1", ["id a", "punct =", r"regex /\//", "punct ,", "dnum 1"]),
-        # next two are from https://www-archive.mozilla.org/js/language/js20-2002-04/rationale/syntax.html#regular-expressions  # NOQA
-        (
-            'for (var x = a in foo && "</x>" || mot ? z:/x:3;x<5;y</g/i) {xyz(x++);}',
-            [
-                "keyword for",
-                "punct (",
-                "keyword var",
-                "id x",
-                "punct =",
-                "id a",
-                "keyword in",
-                "id foo",
-                "punct &&",
-                'string "</x>"',
-                "punct ||",
-                "id mot",
-                "punct ?",
-                "id z",
-                "punct :",
-                "regex /x:3;x<5;y</g",
-                "punct /",
-                "id i",
-                "punct )",
-                "punct {",
-                "id xyz",
-                "punct (",
-                "id x",
-                "punct ++",
-                "punct )",
-                "punct ;",
-                "punct }",
-            ],
-        ),
-        (
-            'for (var x = a in foo && "</x>" || mot ? z/x:3;x<5;y</g/i) {xyz(x++);}',
-            [
-                "keyword for",
-                "punct (",
-                "keyword var",
-                "id x",
-                "punct =",
-                "id a",
-                "keyword in",
-                "id foo",
-                "punct &&",
-                'string "</x>"',
-                "punct ||",
-                "id mot",
-                "punct ?",
-                "id z",
-                "punct /",
-                "id x",
-                "punct :",
-                "dnum 3",
-                "punct ;",
-                "id x",
-                "punct <",
-                "dnum 5",
-                "punct ;",
-                "id y",
-                "punct <",
-                "regex /g/i",
-                "punct )",
-                "punct {",
-                "id xyz",
-                "punct (",
-                "id x",
-                "punct ++",
-                "punct )",
-                "punct ;",
-                "punct }",
-            ],
-        ),
-        # Various "illegal" regexes that are valid according to the std.
-        (
-            r"""/????/, /++++/, /[----]/ """,
-            ["regex /????/", "punct ,", "regex /++++/", "punct ,", "regex /[----]/"],
-        ),
-        # Stress cases from https://stackoverflow.com/questions/5533925/what-javascript-constructs-does-jslex-incorrectly-lex/5573409#5573409  # NOQA
-        (r"""/\[/""", [r"""regex /\[/"""]),
-        (r"""/[i]/""", [r"""regex /[i]/"""]),
-        (r"""/[\]]/""", [r"""regex /[\]]/"""]),
-        (r"""/a[\]]/""", [r"""regex /a[\]]/"""]),
-        (r"""/a[\]]b/""", [r"""regex /a[\]]b/"""]),
-        (r"""/[\]/]/gi""", [r"""regex /[\]/]/gi"""]),
-        (r"""/\[[^\]]+\]/gi""", [r"""regex /\[[^\]]+\]/gi"""]),
-        (
-            r"""
-                rexl.re = {
-                NAME: /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/,
-                UNQUOTED_LITERAL: /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/,
-                QUOTED_LITERAL: /^'(?:[^']|'')*'/,
-                NUMERIC_LITERAL: /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/,
-                SYMBOL: /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/
-                };
-            """,  # NOQA
-            [
-                "id rexl",
-                "punct .",
-                "id re",
-                "punct =",
-                "punct {",
-                "id NAME",
-                "punct :",
-                r"""regex /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/""",
-                "punct ,",
-                "id UNQUOTED_LITERAL",
-                "punct :",
-                r"""regex /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/""",
-                "punct ,",
-                "id QUOTED_LITERAL",
-                "punct :",
-                r"""regex /^'(?:[^']|'')*'/""",
-                "punct ,",
-                "id NUMERIC_LITERAL",
-                "punct :",
-                r"""regex /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/""",
-                "punct ,",
-                "id SYMBOL",
-                "punct :",
-                r"""regex /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/""",  # NOQA
-                "punct }",
-                "punct ;",
-            ],
-        ),
-        (
-            r"""
-                rexl.re = {
-                NAME: /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/,
-                UNQUOTED_LITERAL: /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/,
-                QUOTED_LITERAL: /^'(?:[^']|'')*'/,
-                NUMERIC_LITERAL: /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/,
-                SYMBOL: /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/
-                };
-                str = '"';
-            """,  # NOQA
-            [
-                "id rexl",
-                "punct .",
-                "id re",
-                "punct =",
-                "punct {",
-                "id NAME",
-                "punct :",
-                r"""regex /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/""",
-                "punct ,",
-                "id UNQUOTED_LITERAL",
-                "punct :",
-                r"""regex /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/""",
-                "punct ,",
-                "id QUOTED_LITERAL",
-                "punct :",
-                r"""regex /^'(?:[^']|'')*'/""",
-                "punct ,",
-                "id NUMERIC_LITERAL",
-                "punct :",
-                r"""regex /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/""",
-                "punct ,",
-                "id SYMBOL",
-                "punct :",
-                r"""regex /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/""",  # NOQA
-                "punct }",
-                "punct ;",
-                "id str",
-                "punct =",
-                """string '"'""",
-                "punct ;",
-            ],
-        ),
-        (
-            r' this._js = "e.str(\"" + this.value.replace(/\\/g, "\\\\")'
-            r'.replace(/"/g, "\\\"") + "\")"; ',
-            [
-                "keyword this",
-                "punct .",
-                "id _js",
-                "punct =",
-                r'''string "e.str(\""''',
-                "punct +",
-                "keyword this",
-                "punct .",
-                "id value",
-                "punct .",
-                "id replace",
-                "punct (",
-                r"regex /\\/g",
-                "punct ,",
-                r'string "\\\\"',
-                "punct )",
-                "punct .",
-                "id replace",
-                "punct (",
-                r'regex /"/g',
-                "punct ,",
-                r'string "\\\""',
-                "punct )",
-                "punct +",
-                r'string "\")"',
-                "punct ;",
-            ],
-        ),
-    ]
-
-
-def make_function(input, toks):
-    def test_func(self):
-        lexer = JsLexer()
-        result = [
-            "%s %s" % (name, tok) for name, tok in lexer.lex(input) if name != "ws"
-        ]
-        self.assertEqual(result, toks)
-
-    return test_func
-
-
-for i, (input, toks) in enumerate(JsTokensTest.LEX_CASES):
-    setattr(JsTokensTest, "test_case_%d" % i, make_function(input, toks))
-
-
-GETTEXT_CASES = (
-    (
-        r"""
-            a = 1; /* /[0-9]+/ */
-            b = 0x2a0b / 1; // /[0-9]+/
-            c = 3;
-        """,
-        r"""
-            a = 1; /* /[0-9]+/ */
-            b = 0x2a0b / 1; // /[0-9]+/
-            c = 3;
-        """,
-    ),
-    (
-        r"""
-            a = 1.234e-5;
-            /*
-             * /[0-9+/
-             */
-            b = .0123;
-        """,
-        r"""
-            a = 1.234e-5;
-            /*
-             * /[0-9+/
-             */
-            b = .0123;
-        """,
-    ),
-    (
-        r"""
-            x = y / z;
-            alert(gettext("hello"));
-            x /= 3;
-        """,
-        r"""
-            x = y / z;
-            alert(gettext("hello"));
-            x /= 3;
-        """,
-    ),
-    (
-        r"""
-            s = "Hello \"th/foo/ere\"";
-            s = 'He\x23llo \'th/foo/ere\'';
-            s = 'slash quote \", just quote "';
-        """,
-        r"""
-            s = "Hello \"th/foo/ere\"";
-            s = "He\x23llo \'th/foo/ere\'";
-            s = "slash quote \", just quote \"";
-        """,
-    ),
-    (
-        r"""
-            s = "Line continuation\
-            continued /hello/ still the string";/hello/;
-        """,
-        r"""
-            s = "Line continuation\
-            continued /hello/ still the string";"REGEX";
-        """,
-    ),
-    (
-        r"""
-            var regex = /pattern/;
-            var regex2 = /matter/gm;
-            var regex3 = /[*/]+/gm.foo("hey");
-        """,
-        r"""
-            var regex = "REGEX";
-            var regex2 = "REGEX";
-            var regex3 = "REGEX".foo("hey");
-        """,
-    ),
-    (
-        r"""
-            for (var x = a in foo && "</x>" || mot ? z:/x:3;x<5;y</g/i) {xyz(x++);}
-            for (var x = a in foo && "</x>" || mot ? z/x:3;x<5;y</g/i) {xyz(x++);}
-        """,
-        r"""
-            for (var x = a in foo && "</x>" || mot ? z:"REGEX"/i) {xyz(x++);}
-            for (var x = a in foo && "</x>" || mot ? z/x:3;x<5;y<"REGEX") {xyz(x++);}
-        """,
-    ),
-    (
-        """
-            \\u1234xyz = gettext('Hello there');
-        """,
-        r"""
-            Uu1234xyz = gettext("Hello there");
-        """,
-    ),
-)
-
-
-class JsToCForGettextTest(SimpleTestCase):
-    pass
-
-
-def make_function(js, c):
-    def test_func(self):
-        self.assertEqual(prepare_js_for_gettext(js), c)
-
-    return test_func
-
-
-for i, pair in enumerate(GETTEXT_CASES):
-    setattr(JsToCForGettextTest, "test_case_%d" % i, make_function(*pair))