diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 01:20:45 +0100 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 01:20:45 +0100 |
| commit | 658d33c3b35e0cb0cdcb75c80026192adad14a4c (patch) | |
| tree | 181f33d5c6241bde6e2d04bd6dc49e3093aa0c21 /filelist.py | |
| parent | 08e350610e90bbab88cf2158c0ffe5cfe273492d (diff) | |
| download | python-setuptools-git-658d33c3b35e0cb0cdcb75c80026192adad14a4c.tar.gz | |
Issue #13193: fix distutils.filelist.FileList under Windows
Diffstat (limited to 'filelist.py')
| -rw-r--r-- | filelist.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/filelist.py b/filelist.py index a94b5c8e..87b2cc6b 100644 --- a/filelist.py +++ b/filelist.py @@ -313,7 +313,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 |