Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.7.x] Fixed #23298 -- Made makemessages actually ignore specified d…

…irs on Windows.

This was detected by two failures in the i18n.test_extraction of our
test suite.

Refs #20422, refs #22336

Backport of b4dce7c from master
  • Loading branch information...
commit 126606c5b8499830cd56cbe632f6af17bc7471ea 1 parent d818e02
Ramiro Morales authored timgraham committed
Showing with 11 additions and 2 deletions.
  1. +11 −2 django/core/management/commands/makemessages.py
View
13 django/core/management/commands/makemessages.py
@@ -347,8 +347,17 @@ def is_ignored(path, ignore_patterns):
fnmatch.fnmatchcase(path, pattern))
return any(ignore(pattern) for pattern in ignore_patterns)
- dir_suffix = '%s*' % os.sep
- norm_patterns = [p[:-len(dir_suffix)] if p.endswith(dir_suffix) else p for p in self.ignore_patterns]
+ ignore_patterns = [os.path.normcase(p) for p in self.ignore_patterns]
+ dir_suffixes = {'%s*' % path_sep for path_sep in {'/', os.sep}}
+ norm_patterns = []
+ for p in ignore_patterns:
+ for dir_suffix in dir_suffixes:
+ if p.endswith(dir_suffix):
+ norm_patterns.append(p[:-len(dir_suffix)])
+ break
+ else:
+ norm_patterns.append(p)
+
all_files = []
for dirpath, dirnames, filenames in os.walk(force_text(root), topdown=True, followlinks=self.symlinks):
for dirname in dirnames[:]:
Please sign in to comment.
Something went wrong with that request. Please try again.