changeset:   97466:3256764fadae
branch:      2.7
parent:      97301:08e03dfb7dab
user:        Robert Collins <rbtcollins@hp.com>
date:        Mon Aug 24 12:06:18 2015 +1200
files:       Doc/library/unittest.rst Misc/ACKS Misc/NEWS
description:
Issue #22812: Fix unittest discovery examples.

Patch from Pam McA'Nulty.


diff -r 08e03dfb7dab -r 3256764fadae Doc/library/unittest.rst
--- a/Doc/library/unittest.rst	Thu Aug 06 21:08:44 2015 +1200
+++ b/Doc/library/unittest.rst	Mon Aug 24 12:06:18 2015 +1200
@@ -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 -r 08e03dfb7dab -r 3256764fadae Misc/ACKS
--- a/Misc/ACKS	Thu Aug 06 21:08:44 2015 +1200
+++ b/Misc/ACKS	Mon Aug 24 12:06:18 2015 +1200
@@ -880,6 +880,7 @@
 Madison May
 Lucas Maystre
 Arnaud Mazin
+Pam McA'Nulty
 Matt McClure
 Rebecca McCreary
 Kirk McDonald
diff -r 08e03dfb7dab -r 3256764fadae Misc/NEWS
--- a/Misc/NEWS	Thu Aug 06 21:08:44 2015 +1200
+++ b/Misc/NEWS	Mon Aug 24 12:06:18 2015 +1200
@@ -34,6 +34,9 @@
 Library
 -------
 
+- Issue #22812: Fix unittest discovery examples.
+  Patch from Pam McA'Nulty.
+
 - Issue #23652: Make it possible to compile the select module against the
   libc headers from the Linux Standard Base, which do not include some
   EPOLL macros.  Initial patch by Matt Frank.