Issue #13193: Fix distutils.filelist.FileList under Windows. The

"recursive-include" directive now recognizes both legal path separators.
This commit is contained in:
Antoine Pitrou 2011-11-12 01:33:59 +01:00
parent a203cedf44
commit 667383c8d4
2 changed files with 7 additions and 1 deletions

View File

@ -328,7 +328,10 @@ 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)]
pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
# 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])
else: # no prefix -- respect anchor flag
if anchor:
pattern_re = "^" + pattern_re

View File

@ -76,6 +76,9 @@ Core and Builtins
Library
-------
- Issue #13193: Fix distutils.filelist.FileList under Windows. The
"recursive-include" directive now recognizes both legal path separators.
- Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
when called with a timeout. Patch by Arnaud Ysmal.