[Python-checkins] r86143 - python/branches/py3k/Doc/library/unittest.rst

ezio.melotti python-checkins at python.org
Wed Nov 3 21:51:17 CET 2010


Author: ezio.melotti
Date: Wed Nov  3 21:51:17 2010
New Revision: 86143

Log:
Divide the context manager signature from the normal one for consistency with the other methods.

Modified:
   python/branches/py3k/Doc/library/unittest.rst

Modified: python/branches/py3k/Doc/library/unittest.rst
==============================================================================
--- python/branches/py3k/Doc/library/unittest.rst	(original)
+++ python/branches/py3k/Doc/library/unittest.rst	Wed Nov  3 21:51:17 2010
@@ -989,7 +989,8 @@
          :meth:`failUnlessRaises`; use :meth:`assertRaises`.
 
 
-   .. method:: assertRaisesRegexp(exception, regexp[, callable, ...])
+   .. method:: assertRaisesRegexp(exception, regexp, callable, *args, **kwds)
+               assertRaisesRegexp(exception, regexp)
 
       Like :meth:`assertRaises` but also tests that *regexp* matches
       on the string representation of the raised exception.  *regexp* may be
@@ -1041,7 +1042,8 @@
       .. versionadded:: 3.2
 
 
-   .. method:: assertWarnsRegexp(warning, regexp[, callable, ...])
+   .. method:: assertWarnsRegexp(warning, regexp, callable, *args, **kwds)
+               assertWarnsRegexp(warning, regexp)
 
       Like :meth:`assertWarns` but also tests that *regexp* matches on the
       message of the triggered warning.  *regexp* may be a regular expression


More information about the Python-checkins mailing list