[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/0ad5804c4d62
changeset:   71887:0ad5804c4d62
parent:      71886:09f2ddd3d15a
parent:      71885:cc6199ca5c73
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Aug 16 17:46:44 2011 -0500
summary:
  merge heads

files:
  Doc/library/collections.abc.rst |  5 +++--
  Doc/library/collections.rst     |  2 +-
  Doc/license.rst                 |  2 +-
  Lib/shlex.py                    |  2 +-
  Makefile.pre.in                 |  2 +-
  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
--- 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 @@
 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
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -72,7 +72,7 @@
 
       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
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -875,7 +875,7 @@
 ----
 
 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
--- a/Lib/shlex.py
+++ b/Lib/shlex.py
@@ -276,7 +276,7 @@
     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
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1359,7 +1359,7 @@
 		-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
--- a/Tools/scripts/run_tests.py
+++ b/Tools/scripts/run_tests.py
@@ -32,6 +32,8 @@
                  '-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):

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