diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-12 03:41:36 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-12 03:41:36 (GMT) |
| commit | 6faad8de7f6c4b5d13d018d552147766dd5bf12e (patch) | |
| tree | e1971c5b7b41567b78c088c25179b286acf9cddf | |
| parent | c47a4592514568215aa617fc25121a9a9a83e3f1 (diff) | |
| download | cpython-6faad8de7f6c4b5d13d018d552147766dd5bf12e.zip cpython-6faad8de7f6c4b5d13d018d552147766dd5bf12e.tar.gz cpython-6faad8de7f6c4b5d13d018d552147766dd5bf12e.tar.bz2 | |
Fix distutils.filelist.FileList under Windows (#13193).
The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows. Antoine Pitrou
fixed it in 557a973709de by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.
| -rw-r--r-- | Lib/distutils/filelist.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index ebd1411..5540b39 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -328,10 +328,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0): # ditch end of pattern character empty_pattern = glob_to_re('') prefix_re = glob_to_re(prefix)[:-len(empty_pattern)] - # match both path separators, as in Postel's principle - sep_pat = "[" + re.escape(os.path.sep + os.path.altsep - if os.path.altsep else os.path.sep) + "]" - pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re]) + # paths should always use / in manifest templates + pattern_re = "^%s/.*%s" % (prefix_re, pattern_re) else: # no prefix -- respect anchor flag if anchor: pattern_re = "^" + pattern_re @@ -210,8 +210,7 @@ Library - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly handles non-valid attributes, including adjacent and unquoted attributes. -- Issue #13193: Fix distutils.filelist.FileList under Windows. The - "recursive-include" directive now recognizes both legal path separators. +- Issue #13193: Fix distutils.filelist.FileList under Windows. - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely when called with a timeout. Patch by Arnaud Ysmal. |