From 67321cc9b086a62251beeca08f8146c6ceb1a2d4 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 16 Aug 2011 19:03:41 +0300 Subject: [PATCH 1/6] #9723: refactor regex. --- Lib/shlex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/shlex.py b/Lib/shlex.py index 92c49c36084..69f3b456af1 100644 --- a/Lib/shlex.py +++ b/Lib/shlex.py @@ -276,7 +276,7 @@ def split(s, comments=False, posix=True): return list(lex) -_find_unsafe = re.compile(r'[^\w@%\-\+=:,\./]', re.ASCII).search +_find_unsafe = re.compile(r'[^\w@%+=:,./-]', re.ASCII).search def quote(s): """Return a shell-escaped version of the string *s*.""" From b5da6e9e48c10e40c46a487f01ad204aabd4c870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Tue, 16 Aug 2011 19:05:56 +0200 Subject: [PATCH 2/6] Revert change that was not a syntax fix but actually a behavior change --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 1108c75eca7..78b85f656f1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1313,7 +1313,7 @@ funny: -o -name .hgignore \ -o -name .bzrignore \ -o -name MANIFEST \ - -print + -o -print # Perform some verification checks on any modified files. patchcheck: From e5905a9413ed786b322b5adb4820eea12b3233a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Tue, 16 Aug 2011 19:09:56 +0200 Subject: [PATCH 3/6] Fix typo --- Doc/library/collections.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index df231f86a92..14ccffbacee 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -72,7 +72,7 @@ The class can be used to simulate nested scopes and is useful in templating. A user updateable list of mappings. The list is ordered from first-searched to last-searched. It is the only stored state and can - modified to change which mappings are searched. The list should + be modified to change which mappings are searched. The list should always contain at least one mapping. .. method:: new_child() From b389eec44093720270da77fe8e628c1df7f31cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Tue, 16 Aug 2011 19:10:24 +0200 Subject: [PATCH 4/6] Move versionadded directive to the top level, as we do in other files --- Doc/library/collections.abc.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index dbd89ae209e..9873489c103 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -6,6 +6,9 @@ .. moduleauthor:: Raymond Hettinger .. sectionauthor:: Raymond Hettinger +.. versionadded:: 3.3 + Formerly, this module was part of the :mod:`collections` module. + .. testsetup:: * from collections import * @@ -20,8 +23,6 @@ This module provides :term:`abstract base classes ` that can be used to test whether a class provides a particular interface; for example, whether it is hashable or whether it is a mapping. -.. versionchanged:: 3.3 - Formerly, this module was part of the :mod:`collections` module. .. _collections-abstract-base-classes: From 7f0a6ddb9001bc71748b8e47cdf07f72414799bf Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 16 Aug 2011 20:02:26 +0200 Subject: [PATCH 5/6] Use -n for tests under Windows --- Tools/scripts/run_tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py index d8f5ac37b14..f750e192a0e 100755 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -32,6 +32,8 @@ def main(regrtest_args): '-r', # Randomize test order '-w', # Re-run failed tests in verbose mode ]) + if sys.platform == 'win32': + args.append('-n') # Silence alerts under Windows if not any(is_multiprocess_flag(arg) for arg in regrtest_args): args.extend(['-j', '0']) # Use all CPU cores if not any(is_resource_use_flag(arg) for arg in regrtest_args): From f6b25b9e357a6324118cb80cf84cd7f84d6fd5f7 Mon Sep 17 00:00:00 2001 From: Sandro Tosi Date: Tue, 16 Aug 2011 20:03:11 +0200 Subject: [PATCH 6/6] #12761: fix wording of zlib license section --- Doc/license.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/license.rst b/Doc/license.rst index 41d16054b65..e1868e80d24 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -873,7 +873,7 @@ zlib ---- The :mod:`zlib` extension is built using an included copy of the zlib -sources unless the zlib version found on the system is too old to be +sources if the zlib version found on the system is too old to be used for the build:: Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler