Merge 2.7 heads.
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index a082200..41478f3 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -286,8 +286,8 @@
as positional arguments in that order. The following two command lines
are equivalent::
- python -m unittest discover -s project_directory -p '*_test.py'
- python -m unittest discover project_directory '*_test.py'
+ python -m unittest discover -s project_directory -p "*_test.py"
+ python -m unittest discover project_directory "*_test.py"
As well as being a path it is possible to pass a package name, for example
``myproject.subpackage.test``, as the start directory. The package name you
diff --git a/Misc/ACKS b/Misc/ACKS
index e536d40..d732bf0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -881,6 +881,7 @@
Madison May
Lucas Maystre
Arnaud Mazin
+Pam McA'Nulty
Matt McClure
Rebecca McCreary
Kirk McDonald
diff --git a/Misc/NEWS b/Misc/NEWS
index b52cd2a..ebf2ed5c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@
Library
-------
+- Issue #22812: Fix unittest discovery examples.
+ Patch from Pam McA'Nulty.
+
- Issue #24634: Importing uuid should not try to load libc on Windows
- Issue #23652: Make it possible to compile the select module against the
@@ -11216,3 +11219,4 @@
----
**(For information about older versions, consult the HISTORY file.)**
+