diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 00:27:19 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-11-12 00:27:19 (GMT) |
| commit | 61093c0cedc164be3fed2e355ed3cca522ffbbe5 (patch) | |
| tree | ae9b5d9188b45b26b511de38e5a36cf2d1e09fa7 | |
| parent | 04842a84c31d82d9c2255e6575344412c58e518e (diff) | |
| parent | 3714c1ebfd12e99e9bf95b9d9867aca3872bce55 (diff) | |
| download | cpython-61093c0cedc164be3fed2e355ed3cca522ffbbe5.zip cpython-61093c0cedc164be3fed2e355ed3cca522ffbbe5.tar.gz cpython-61093c0cedc164be3fed2e355ed3cca522ffbbe5.tar.bz2 | |
Issue #13193: Fix distutils.filelist.FileList and
packaging.manifest.Manifest under Windows. The "recursive-include"
directive now recognizes both legal path separators.
| -rw-r--r-- | Lib/distutils/filelist.py | 5 | ||||
| -rw-r--r-- | Lib/packaging/manifest.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index a94b5c8..87b2cc6 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/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 diff --git a/Lib/packaging/manifest.py b/Lib/packaging/manifest.py index 5eee174..adf4633 100644 --- a/Lib/packaging/manifest.py +++ b/Lib/packaging/manifest.py @@ -366,7 +366,10 @@ def _translate_pattern(pattern, anchor=True, prefix=None, is_regex=False): # 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 @@ -365,6 +365,10 @@ Core and Builtins Library ------- +- Issue #13193: Fix distutils.filelist.FileList and + packaging.manifest.Manifest under Windows. The "recursive-include" + directive now recognizes both legal path separators. + - Issue #13384: Remove unnecessary __future__ import in Lib/random.py - Issue #13149: Speed up append-only StringIO objects. |