summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-08-24 00:14:28 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-08-24 00:14:28 (GMT)
commita2b005539687789774f52507bda4d0cecaddb583 (patch)
tree4cb7f801723ecf792af0b26357695f204d810999
parentab7cc7598a3b8fd3bfb8c21412ac693ba8e9396a (diff)
downloadcpython-a2b005539687789774f52507bda4d0cecaddb583.zip
cpython-a2b005539687789774f52507bda4d0cecaddb583.tar.gz
cpython-a2b005539687789774f52507bda4d0cecaddb583.tar.bz2
Issue #22812: Fix unittest discovery examples.
Patch from Pam McA'Nulty.
-rw-r--r--Doc/library/unittest.rst4
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index f13100c..a8a684c 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -271,8 +271,8 @@ The :option:`-s`, :option:`-p`, and :option:`-t` options can be passed in
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 395b9e5..cb4f5a6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -894,6 +894,7 @@ Daniel May
Madison May
Lucas Maystre
Arnaud Mazin
+Pam McA'Nulty
Matt McClure
Rebecca McCreary
Kirk McDonald
diff --git a/Misc/NEWS b/Misc/NEWS
index 1a2aebf..b4fa7a1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -449,6 +449,9 @@ C API
Documentation
-------------
+- Issue #22812: Fix unittest discovery examples.
+ Patch from Pam McA'Nulty.
+
- Issue #24129: Clarify the reference documentation for name resolution.
This includes removing the assumption that readers will be familiar with the
name resolution scheme Python used prior to the introduction of lexical