[Python-checkins] cpython (merge 3.2 -> default): Merge fixes for #13193 and FAQ from 3.2

[eric.araujo]

http://hg.python.org/cpython/rev/68347f8430ec
changeset:   74883:68347f8430ec
parent:      74878:f2323ee5d6c7
parent:      74882:90b30d62caf2
user:        Éric Araujo <merwok at netwok.org>
date:        Sun Feb 12 04:58:46 2012 +0100
summary:
  Merge fixes for #13193 and FAQ from 3.2

files:
  Doc/faq/general.rst       |  2 +-
  Lib/distutils/filelist.py |  6 ++----
  Misc/NEWS                 |  4 +---
  3 files changed, 4 insertions(+), 8 deletions(-)


diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -157,7 +157,7 @@
 
 The latest Python source distribution is always available from python.org, at
 http://www.python.org/download/.  The latest development sources can be obtained
-via anonymous Subversion at http://svn.python.org/projects/python/trunk.
+via anonymous Mercurial access at http://hg.python.org/cpython.
 
 The source distribution is a gzipped tar file containing the complete C source,
 Sphinx-formatted documentation, Python library modules, example programs, and
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -313,10 +313,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
@@ -777,9 +777,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 and
-  packaging.manifest.Manifest under Windows.  The "recursive-include"
-  directive now recognizes both legal path separators.
+- Issue #13193: Fix distutils.filelist.FileList under Windows.
 
 - Issue #13384: Remove unnecessary __future__ import in Lib/random.py
 

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