diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-08-16 22:46:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-08-16 22:46:44 (GMT) |
| commit | 51be6e0a0f21ece0fbd6c046616c5b504246b70f (patch) | |
| tree | 58ea93e875a16483649d42cfb1122d0cc1b8afc3 | |
| parent | ae6ae025d10d35cf7f125b55f4260826ed0c69b8 (diff) | |
| parent | d6fe58d701e8109ef55ebe71532819f7fc69e9fb (diff) | |
| download | cpython-51be6e0a0f21ece0fbd6c046616c5b504246b70f.zip cpython-51be6e0a0f21ece0fbd6c046616c5b504246b70f.tar.gz cpython-51be6e0a0f21ece0fbd6c046616c5b504246b70f.tar.bz2 | |
merge heads
| -rw-r--r-- | Doc/library/collections.abc.rst | 5 | ||||
| -rw-r--r-- | Doc/library/collections.rst | 2 | ||||
| -rw-r--r-- | Doc/license.rst | 2 | ||||
| -rw-r--r-- | Lib/shlex.py | 2 | ||||
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rwxr-xr-x | Tools/scripts/run_tests.py | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst index dbd89ae..9873489 100644 --- a/Doc/library/collections.abc.rst +++ b/Doc/library/collections.abc.rst @@ -6,6 +6,9 @@ .. moduleauthor:: Raymond Hettinger <python at rcn.com> .. sectionauthor:: Raymond Hettinger <python at rcn.com> +.. 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 <abstract base class>` 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: diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index df231f8..14ccffb 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() diff --git a/Doc/license.rst b/Doc/license.rst index d0b370f..9119f18 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -875,7 +875,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 diff --git a/Lib/shlex.py b/Lib/shlex.py index 92c49c3..69f3b45 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*.""" diff --git a/Makefile.pre.in b/Makefile.pre.in index cc7c389..055f4a5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1359,7 +1359,7 @@ funny: -o -name .hgignore \ -o -name .bzrignore \ -o -name MANIFEST \ - -print + -o -print # Perform some verification checks on any modified files. patchcheck: diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py index d8f5ac3..f750e19 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): |