Commit 23b234a9 authored by Tai Lee's avatar Tai Lee Committed by Claude Paroz
Browse files

[1.5.x] Fixed #20354 -- `makemessages` no longer crashes with `UnicodeDecodeError` 

Handle the `UnicodeDecodeError` exception, send a warning to `stdout` with the
file name and location, and continue processing other files.
Backport of 99a6f0e7 from master.
parent acd9dc38

django/core/management/commands/makemessages.py

+5 −2
Original line number Diff line number Diff line
@@ -324,8 +324,11 @@ def make_messages(locale=None, domain='django', verbosity=1, all=False, 


        for dirpath, file in find_files(".", ignore_patterns, verbosity,

                stdout, symlinks=symlinks):

            try:

                process_file(file, dirpath, potfile, domain, verbosity, extensions,

                        wrap, location, stdout)

            except UnicodeDecodeError:

                stdout.write("UnicodeDecodeError: skipped file %s in %s" % (file, dirpath))



        if os.path.exists(potfile):

            write_po_file(pofile, potfile, domain, locale, verbosity, stdout,

tests/regressiontests/i18n/commands/extraction.py

+14 −1
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ class ExtractorTests(TestCase): 
            return

        shutil.rmtree(dname)



    def rmfile(self, filepath):

        if os.path.exists(filepath):

            os.remove(filepath)



    def tearDown(self):

        os.chdir(self.test_dir)

        try:
@@ -120,12 +124,21 @@ class BasicExtractorTests(ExtractorTests): 
        # Check that the temporary file was cleaned up

        self.assertFalse(os.path.exists('./templates/template_with_error.html.py'))



    def test_unicode_decode_error(self):

        os.chdir(self.test_dir)

        shutil.copyfile('./not_utf8.sample', './not_utf8.txt')

        self.addCleanup(self.rmfile, os.path.join(self.test_dir, 'not_utf8.txt'))

        stdout = StringIO()

        management.call_command('makemessages', locale=LOCALE, stdout=stdout)

        self.assertIn("UnicodeDecodeError: skipped file not_utf8.txt in .",

                      force_text(stdout.getvalue()))



    def test_extraction_warning(self):

        os.chdir(self.test_dir)

        shutil.copyfile('./code.sample', './code_sample.py')

        self.addCleanup(self.rmfile, os.path.join(self.test_dir, 'code_sample.py'))

        stdout = StringIO()

        management.call_command('makemessages', locale=LOCALE, stdout=stdout)

        os.remove('./code_sample.py')

        self.assertIn("code_sample.py:4", force_text(stdout.getvalue()))



    def test_template_message_context_extractor(self):

tests/regressiontests/i18n/commands/not_utf8.sample

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Copyright (c) 2009 yvind Sean Kinsey, oyvind@kinsey.no
 
 No newline at end of file