From 8f0ffe587b5287dcac727cad3b8078aa1d85c07d Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 12 Nov 2011 01:20:45 +0100 Subject: Issue #13193: fix distutils.filelist.FileList under Windows --- Lib/distutils/filelist.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index a94b5c8e96..87b2cc6bc4 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 -- cgit v1.2.1 From 3714c1ebfd12e99e9bf95b9d9867aca3872bce55 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 12 Nov 2011 01:22:11 +0100 Subject: Add NEWS entry for #13193 --- Misc/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index b1710d88bf..6f526f6047 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -73,6 +73,9 @@ Core and Builtins Library ------- +- Issue #13193: Fix distutils.filelist.FileList under Windows. The + "recursive-include" directive now recognizes both legal path separators. + - Issue #13384: Remove unnecessary __future__ import in Lib/random.py - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely -- cgit v1.2.1