diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 00:33:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 00:33:59 (GMT) |
| commit | 667383c8d4c9f2169536cafb5f56943c8ef852fe (patch) | |
| tree | caaab585a064054502756a3a12e91826a2908dac /Lib/distutils | |
| parent | a203cedf44c4cfd6dd35871e15086294a4d223b1 (diff) | |
| download | cpython-667383c8d4c9f2169536cafb5f56943c8ef852fe.zip cpython-667383c8d4c9f2169536cafb5f56943c8ef852fe.tar.gz cpython-667383c8d4c9f2169536cafb5f56943c8ef852fe.tar.bz2 | |
Issue #13193: Fix distutils.filelist.FileList under Windows. The
"recursive-include" directive now recognizes both legal path separators.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/filelist.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index 4aac6d3..ebd1411 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -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 |