From b9df745ab50608454418779d67319d987d9bd13d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=89ric=20Araujo?= Date: Sun, 12 Feb 2012 05:01:42 +0100 Subject: [PATCH] Port the fix for #13193 to packaging --- Lib/packaging/manifest.py | 6 ++---- Misc/NEWS | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Lib/packaging/manifest.py b/Lib/packaging/manifest.py index adf463363e..9826d29a1e 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 diff --git a/Misc/NEWS b/Misc/NEWS index 5fd731d591..c36225267c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 -- 2.50.1