Issue #13193: Fix distutils.filelist.FileList and
packaging.manifest.Manifest 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 a94b5c8..87b2cc6 100644
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -313,7 +313,10 @@
# 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/Lib/packaging/manifest.py b/Lib/packaging/manifest.py
index 5eee174..adf4633 100644
--- a/Lib/packaging/manifest.py
+++ b/Lib/packaging/manifest.py
@@ -366,7 +366,10 @@
# 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 56802b5..05ff988 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -365,6 +365,10 @@
Library
-------
+- Issue #13193: Fix distutils.filelist.FileList and
+ packaging.manifest.Manifest under Windows. The "recursive-include"
+ directive now recognizes both legal path separators.
+
- Issue #13384: Remove unnecessary __future__ import in Lib/random.py
- Issue #13149: Speed up append-only StringIO objects.