[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #22812: Fix unittest discovery examples.

[robert.collins]

https://hg.python.org/cpython/rev/875a851b9d5a
changeset:   97469:875a851b9d5a
branch:      3.5
parent:      97460:738de9a9a3ea
parent:      97468:e285606efb82
user:        Robert Collins <rbtcollins at hp.com>
date:        Mon Aug 24 12:15:05 2015 +1200
summary:
  Issue #22812: Fix unittest discovery examples.

Patch from Pam McA'Nulty.

files:
  Doc/library/unittest.rst |  4 ++--
  Misc/ACKS                |  1 +
  Misc/NEWS                |  3 +++
  3 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -278,8 +278,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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -920,6 +920,7 @@
 Madison May
 Lucas Maystre
 Arnaud Mazin
+Pam McA'Nulty
 Matt McClure
 Jack McCracken
 Rebecca McCreary
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@
 Documentation
 -------------
 
+- Issue #22812: Fix unittest discovery examples.
+  Patch from Pam McA'Nulty.
+
 
 What's New in Python 3.5.0 release candidate 2?
 ===============================================

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