[Python-checkins] cpython (2.7): Fix distutils.filelist.FileList under Windows (#13193).

[eric.araujo]

http://hg.python.org/cpython/rev/c566a3447ba1
changeset:   74879:c566a3447ba1
branch:      2.7
parent:      74871:6240ff5dfebe
user:        Éric Araujo <merwok at netwok.org>
date:        Sun Feb 12 04:41:36 2012 +0100
summary:
  Fix distutils.filelist.FileList under Windows (#13193).

The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows.  Antoine Pitrou
fixed it in 557a973709de by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.

files:
  Lib/distutils/filelist.py |  6 ++----
  Misc/NEWS                 |  3 +--
  2 files changed, 3 insertions(+), 6 deletions(-)


diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -328,10 +328,8 @@
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
-        # 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])
+        # paths should always use / in manifest templates
+        pattern_re = "^%s/.*%s" % (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
@@ -210,8 +210,7 @@
 - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly
   handles non-valid attributes, including adjacent and unquoted attributes.
 
-- Issue #13193: Fix distutils.filelist.FileList under Windows.  The
-  "recursive-include" directive now recognizes both legal path separators.
+- Issue #13193: Fix distutils.filelist.FileList under Windows.
 
 - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
   when called with a timeout.  Patch by Arnaud Ysmal.

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