[Python-checkins] cpython (merge 3.2 -> default): Issue #13193: Fix distutils.filelist.FileList and

[antoine.pitrou]

http://hg.python.org/cpython/rev/64485e0700ba
changeset:   73517:64485e0700ba
parent:      73513:60fd58a56f44
parent:      73516:80d5040f2a78
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 12 01:27:19 2011 +0100
summary:
  Issue #13193: Fix distutils.filelist.FileList and
packaging.manifest.Manifest under Windows.  The "recursive-include"
directive now recognizes both legal path separators.

files:
  Lib/distutils/filelist.py |  5 ++++-
  Lib/packaging/manifest.py |  5 ++++-
  Misc/NEWS                 |  4 ++++
  3 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
--- 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
--- 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
--- 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.

-- 
Repository URL: http://hg.python.org/cpython