Issue #13193: Fix distutils.filelist.FileList under Windows. The

"recursive-include" directive now recognizes both legal path separators.

diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
index 4aac6d397a77bf7cd8b0e36dc3128fd6ef2cf3d5..ebd1411817f992865c5cab3c404edcac8d554230 100644 (file)
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -328,7 +328,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/Misc/NEWS b/Misc/NEWS
index 9517677ee28e7f6b396d599e2f8795a50af4b854..259d08a5f5523d34fe282394ba7283c60f816a23 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,6 +76,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13193: Fix distutils.filelist.FileList under Windows.  The
+  "recursive-include" directive now recognizes both legal path separators.
+
 - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
   when called with a timeout.  Patch by Arnaud Ysmal.