diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-12 04:01:42 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-12 04:01:42 (GMT) |
| commit | b9df745ab50608454418779d67319d987d9bd13d (patch) | |
| tree | fea94ad0d8c0b89e7a6bd86414a3329030816dcd | |
| parent | a9d2b6420692c0bd1c17450d67fd1843603259fa (diff) | |
| download | cpython-b9df745ab50608454418779d67319d987d9bd13d.zip cpython-b9df745ab50608454418779d67319d987d9bd13d.tar.gz cpython-b9df745ab50608454418779d67319d987d9bd13d.tar.bz2 | |
Port the fix for #13193 to packaging
| -rw-r--r-- | Lib/packaging/manifest.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Lib/packaging/manifest.py b/Lib/packaging/manifest.py index adf4633..9826d29 100644 --- a/Lib/packaging/manifest.py +++ b/Lib/packaging/manifest.py @@ -366,10 +366,8 @@ 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)] - # 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]) + # paths should always use / in manifest templates + pattern_re = "^%s/.*%s" % (prefix_re, pattern_re) else: # no prefix -- respect anchor flag if anchor: pattern_re = "^" + pattern_re @@ -777,7 +777,8 @@ Library - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly handles non-valid attributes, including adjacent and unquoted attributes. -- Issue #13193: Fix distutils.filelist.FileList under Windows. +- Issue #13193: Fix distutils.filelist.FileList and packaging.manifest.Manifest + under Windows. - Issue #13384: Remove unnecessary __future__ import in Lib/random.py |