[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

terry.reedy python-checkins at python.org
Fri Apr 11 20:12:12 CEST 2014


http://hg.python.org/cpython/rev/a3f8afbd3973
changeset:   90221:a3f8afbd3973
parent:      90218:273e17260d25
parent:      90220:5734175a87d1
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Apr 11 14:11:34 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/unittest.rst |  4 ++--
  1 files changed, 2 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
@@ -1807,14 +1807,14 @@
       Called after the test case *test* has been executed, regardless of the
       outcome.
 
-   .. method:: startTestRun(test)
+   .. method:: startTestRun()
 
       Called once before any tests are executed.
 
       .. versionadded:: 3.1
 
 
-   .. method:: stopTestRun(test)
+   .. method:: stopTestRun()
 
       Called once after all tests are executed.
 

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


More information about the Python-checkins mailing list