test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #22336 -- Added path matching for makemessages ignore option 

This fixes a regression introduced by 9012a9e200.
This commit is contained in:
Justin Hamade 2014-08-08 22:47:35 +02:00 committed by Claude Paroz
parent 09c0fa2c53
commit 8fe406864c
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,8 @@ class Command(BaseCommand):
Check if the given path should be ignored or not. Check if the given path should be ignored or not.
""" """
filename = os.path.basename(path) filename = os.path.basename(path)
ignore = lambda pattern: fnmatch.fnmatchcase(filename, pattern) ignore = lambda pattern: (fnmatch.fnmatchcase(filename, pattern) or
fnmatch.fnmatchcase(path, pattern))
return any(ignore(pattern) for pattern in ignore_patterns) return any(ignore(pattern) for pattern in ignore_patterns)
dir_suffix = '%s*' % os.sep dir_suffix = '%s*' % os.sep

2
tests/i18n/commands/templates/subdir/ignored.html Normal file
View File

@ -0,0 +1,2 @@
{% load i18n %}
{% trans "This subdir should be ignored too." %}

46
tests/i18n/test_extraction.py
View File

@ -360,35 +360,47 @@ class JavascriptExtractorTests(ExtractorTests):
class IgnoredExtractorTests(ExtractorTests): class IgnoredExtractorTests(ExtractorTests):
def test_ignore_option(self): def _run_makemessages(self, **options):
os.chdir(self.test_dir) os.chdir(self.test_dir)
ignore_patterns = [
os.path.join('ignore_dir', '*'),
'xxx_*',
]
stdout = StringIO() stdout = StringIO()
management.call_command('makemessages', locale=[LOCALE], verbosity=2, management.call_command('makemessages', locale=[LOCALE], verbosity=2,
ignore_patterns=ignore_patterns, stdout=stdout) stdout=stdout, **options)
data = stdout.getvalue() data = stdout.getvalue()
self.assertTrue("ignoring directory ignore_dir" in data)
self.assertTrue("ignoring file xxx_ignored.html" in data)
self.assertTrue(os.path.exists(self.PO_FILE)) self.assertTrue(os.path.exists(self.PO_FILE))
with open(self.PO_FILE, 'r') as fp: with open(self.PO_FILE, 'r') as fp:
po_contents = fp.read() po_contents = fp.read()
self.assertMsgId('This literal should be included.', po_contents) return data, po_contents
self.assertNotMsgId('This should be ignored.', po_contents)
self.assertNotMsgId('This should be ignored too.', po_contents) def test_ignore_directory(self):
out, po_contents = self._run_makemessages(ignore_patterns=[
os.path.join('ignore_dir', '*'),
])
self.assertTrue("ignoring directory ignore_dir" in out)
self.assertMsgId('This literal should be included.', po_contents)
self.assertNotMsgId('This should be ignored.', po_contents)
def test_ignore_subdirectory(self):
out, po_contents = self._run_makemessages(ignore_patterns=[
'templates/*/ignore.html',
'templates/subdir/*',
])
self.assertTrue("ignoring directory subdir" in out)
self.assertNotMsgId('This subdir should be ignored too.', po_contents)
def test_ignore_file_patterns(self):
out, po_contents = self._run_makemessages(ignore_patterns=[
'xxx_*',
])
self.assertTrue("ignoring file xxx_ignored.html" in out)
self.assertNotMsgId('This should be ignored too.', po_contents)
@override_settings( @override_settings(
STATIC_ROOT=os.path.join(this_directory, 'commands', 'static_root/'), STATIC_ROOT=os.path.join(this_directory, 'commands', 'static_root/'),
MEDIA_ROOT=os.path.join(this_directory, 'commands', 'media_root/')) MEDIA_ROOT=os.path.join(this_directory, 'commands', 'media_root/'))
def test_media_static_dirs_ignored(self): def test_media_static_dirs_ignored(self):
os.chdir(self.test_dir) out, _ = self._run_makemessages()
stdout = StringIO() self.assertIn("ignoring directory static_root", out)
management.call_command('makemessages', locale=[LOCALE], verbosity=2, stdout=stdout) self.assertIn("ignoring directory media_root", out)
data = stdout.getvalue()
self.assertIn("ignoring directory static_root", data)
self.assertIn("ignoring directory media_root", data)
class SymlinkExtractorTests(ExtractorTests): class SymlinkExtractorTests(ExtractorTests):