mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 07:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix distutils.filelist.FileList under Windows (#13193).

Browse source 
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.
This commit is contained in:
Éric Araujo 2012-02-12 04:41:36 +01:00
parent c47a459251
commit 6faad8de7f
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/filelist.py
View file

@ -328,10 +328,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
# ditch end of pattern character # ditch end of pattern character
empty_pattern = glob_to_re('') empty_pattern = glob_to_re('')
prefix_re = glob_to_re(prefix)[:-len(empty_pattern)] prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
# match both path separators, as in Postel's principle # paths should always use / in manifest templates
sep_pat = "[" + re.escape(os.path.sep + os.path.altsep pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
if os.path.altsep else os.path.sep) + "]"
pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
else: # no prefix -- respect anchor flag else: # no prefix -- respect anchor flag
if anchor: if anchor:
pattern_re = "^" + pattern_re pattern_re = "^" + pattern_re

3
Misc/NEWS
View file

@ -210,8 +210,7 @@ Library
- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly
handles non-valid attributes, including adjacent and unquoted attributes. handles non-valid attributes, including adjacent and unquoted attributes.
- Issue #13193: Fix distutils.filelist.FileList under Windows. The - Issue #13193: Fix distutils.filelist.FileList under Windows.
"recursive-include" directive now recognizes both legal path separators.
- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
when called with a timeout. Patch by Arnaud Ysmal. when called with a timeout. Patch by Arnaud Ysmal.