mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 06:55:47 +00:00
Code Issues 30 Releases Wiki Activity

Fixed #34952 -- Copied dir list when processing locale folders to avoid missing entries during os.walk traversal.

Browse Source 
Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
This commit is contained in:
Andrew Cordery 2023-11-07 12:32:19 +01:00 committed by Natalia Bidart
parent b863c5ffde
commit ad41f1c53a
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/compilemessages.py
View File

@ -91,7 +91,8 @@ class Command(BaseCommand):
# Walk entire tree, looking for locale directories # Walk entire tree, looking for locale directories
for dirpath, dirnames, filenames in os.walk(".", topdown=True): for dirpath, dirnames, filenames in os.walk(".", topdown=True):
for dirname in dirnames: # As we may modify dirnames, iterate through a copy of it instead
for dirname in list(dirnames):
if is_ignored_path( if is_ignored_path(
os.path.normpath(os.path.join(dirpath, dirname)), ignore_patterns os.path.normpath(os.path.join(dirpath, dirname)), ignore_patterns
): ):

58
tests/i18n/test_compilation.py
View File

@ -195,6 +195,64 @@ class IgnoreDirectoryCompilationTests(MessageCompilationTests):
self.assertNoneExist(self.CACHE_DIR, ["en", "fr", "it"]) self.assertNoneExist(self.CACHE_DIR, ["en", "fr", "it"])
self.assertNoneExist(self.NESTED_DIR, ["en", "fr", "it"]) self.assertNoneExist(self.NESTED_DIR, ["en", "fr", "it"])
def test_no_dirs_accidentally_skipped(self):
os_walk_results = [
# To discover .po filepaths, compilemessages uses with a starting list of
# basedirs to inspect, which in this scenario are:
# ["conf/locale", "locale"]
# Then os.walk is used to discover other locale dirs, ignoring dirs matching
# `ignore_patterns`. Mock the results to place an ignored directory directly
# before and after a directory named "locale".
[("somedir", ["ignore", "locale", "ignore"], [])],
# This will result in three basedirs discovered:
# ["conf/locale", "locale", "somedir/locale"]
# os.walk is called for each locale in each basedir looking for .po files.
# In this scenario, we need to mock os.walk results for "en", "fr", and "it"
# locales for each basedir:
[("exclude/locale/LC_MESSAGES", [], ["en.po"])],
[("exclude/locale/LC_MESSAGES", [], ["fr.po"])],
[("exclude/locale/LC_MESSAGES", [], ["it.po"])],
[("exclude/conf/locale/LC_MESSAGES", [], ["en.po"])],
[("exclude/conf/locale/LC_MESSAGES", [], ["fr.po"])],
[("exclude/conf/locale/LC_MESSAGES", [], ["it.po"])],
[("exclude/somedir/locale/LC_MESSAGES", [], ["en.po"])],
[("exclude/somedir/locale/LC_MESSAGES", [], ["fr.po"])],
[("exclude/somedir/locale/LC_MESSAGES", [], ["it.po"])],
]
module_path = "django.core.management.commands.compilemessages"
with mock.patch(f"{module_path}.os.walk", side_effect=os_walk_results):
with mock.patch(f"{module_path}.os.path.isdir", return_value=True):
with mock.patch(
f"{module_path}.Command.compile_messages"
) as mock_compile_messages:
call_command("compilemessages", ignore=["ignore"], verbosity=4)
expected = [
(
[
("exclude/locale/LC_MESSAGES", "en.po"),
("exclude/locale/LC_MESSAGES", "fr.po"),
("exclude/locale/LC_MESSAGES", "it.po"),
],
),
(
[
("exclude/conf/locale/LC_MESSAGES", "en.po"),
("exclude/conf/locale/LC_MESSAGES", "fr.po"),
("exclude/conf/locale/LC_MESSAGES", "it.po"),
],
),
(
[
("exclude/somedir/locale/LC_MESSAGES", "en.po"),
("exclude/somedir/locale/LC_MESSAGES", "fr.po"),
("exclude/somedir/locale/LC_MESSAGES", "it.po"),
],
),
]
self.assertEqual([c.args for c in mock_compile_messages.mock_calls], expected)
class CompilationErrorHandling(MessageCompilationTests): class CompilationErrorHandling(MessageCompilationTests):
def test_error_reported_by_msgfmt(self): def test_error_reported_by_msgfmt(self):