mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge fixes for #13193 and FAQ from 3.2

Browse source
This commit is contained in:
Éric Araujo 2012-02-12 04:58:46 +01:00
commit a9d2b64206
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/faq/general.rst
View file

@ -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 The latest Python source distribution is always available from python.org, at
http://www.python.org/download/. The latest development sources can be obtained 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, The source distribution is a gzipped tar file containing the complete C source,
Sphinx-formatted documentation, Python library modules, example programs, and Sphinx-formatted documentation, Python library modules, example programs, and

6
Lib/distutils/filelist.py
View file

@ -313,10 +313,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
# ditch end of pattern character # ditch end of pattern character
empty_pattern = glob_to_re('') empty_pattern = glob_to_re('')
prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)] prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
# match both path separators, as in Postel's principle # paths should always use / in manifest templates
sep_pat = "[" + re.escape(os.path.sep + os.path.altsep pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
if os.path.altsep else os.path.sep) + "]"
pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
else: # no prefix -- respect anchor flag else: # no prefix -- respect anchor flag
if anchor: if anchor:
pattern_re = "^" + pattern_re pattern_re = "^" + pattern_re

4
Misc/NEWS
View file

@ -777,9 +777,7 @@ Library
- Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly - Issues #1745761, #755670, #13357, #12629, #1200313: HTMLParser now correctly
handles non-valid attributes, including adjacent and unquoted attributes. handles non-valid attributes, including adjacent and unquoted attributes.
- Issue #13193: Fix distutils.filelist.FileList and - Issue #13193: Fix distutils.filelist.FileList under Windows.
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 #13384: Remove unnecessary __future__ import in Lib/random.py