diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-12 03:58:46 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-12 03:58:46 (GMT) |
| commit | a9d2b6420692c0bd1c17450d67fd1843603259fa (patch) | |
| tree | d360e13a62e73b934caf8039c26706ebd7dd5862 | |
| parent | 4f863433fd570cf22d765c051433d24fd523a031 (diff) | |
| parent | 9ce366a5a691fb929c41d7f2c065bcbbddc81026 (diff) | |
| download | cpython-a9d2b6420692c0bd1c17450d67fd1843603259fa.zip cpython-a9d2b6420692c0bd1c17450d67fd1843603259fa.tar.gz cpython-a9d2b6420692c0bd1c17450d67fd1843603259fa.tar.bz2 | |
Merge fixes for #13193 and FAQ from 3.2
| -rw-r--r-- | Doc/faq/general.rst | 2 | ||||
| -rw-r--r-- | Lib/distutils/filelist.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 53c3b61..9f26dc9 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -157,7 +157,7 @@ How do I obtain a copy of the Python source? 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 index 87b2cc6..9122032 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -313,10 +313,8 @@ 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)] - # 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 @@ -777,9 +777,7 @@ Library - 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 |