[Python-checkins] (merge 3.2 -> default): Merge from 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/3599798bcbd2
changeset:   68348:3599798bcbd2
parent:      68344:1e00b161f5f5
parent:      68347:6e3551d37b03
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Mar 10 13:54:21 2011 +0200
summary:
  Merge from 3.2.

files:
  

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