From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Nov 2011 00:20:45 +0000 (+0100)
Subject: Issue #13193: fix distutils.filelist.FileList under Windows
X-Git-Tag: v3.3.0a1~860^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f0ffe587b5287dcac727cad3b8078aa1d85c07d;p=python

Issue #13193: fix distutils.filelist.FileList under Windows
---

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