[Python-checkins] (merge 3.1 -> 3.2): Port a couple of changes from 3.1.

Thu Mar 10 12:47:17 CET 2011

http://hg.python.org/cpython/rev/6e3551d37b03
changeset: 68347:6e3551d37b03
branch: 3.2
parent: 68343:605c74139754
parent: 68346:cb3a925de1bd
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Mar 10 13:46:50 2011 +0200
summary:
 Port a couple of changes from 3.1.
files:
 Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1408,7 +1408,7 @@
 If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called,
 then any cleanup functions added will still be called.
 
- .. versionadded:: 3.2
+ .. versionadded:: 3.1
 
 
 .. method:: doCleanups()
@@ -1424,7 +1424,7 @@
 :meth:`doCleanups` pops methods off the stack of cleanup
 functions one at a time, so it can be called at any time.
 
- .. versionadded:: 3.2
+ .. versionadded:: 3.1
 
 
 .. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None)
@@ -1801,14 +1801,14 @@
 
 Called once before any tests are executed.
 
- .. versionadded:: 3.2
+ .. versionadded:: 3.1
 
 
 .. method:: stopTestRun(test)
 
 Called once after all tests are executed.
 
- .. versionadded:: 3.2
+ .. versionadded:: 3.1
 
 
 .. method:: addError(test, err)
@@ -1922,7 +1922,7 @@
 
 
 .. function:: main(module='__main__', defaultTest=None, argv=None, testRunner=None, \
- testLoader=unittest.loader.defaultTestLoader, exit=True, verbosity=1, \
+ testLoader=unittest.defaultTestLoader, exit=True, verbosity=1, \
 failfast=None, catchbreak=None, buffer=None, warnings=None)
 
 A command-line program that runs a set of tests; this is primarily for making
-- 
Repository URL: http://hg.python.org/cpython
