[Python-checkins] r57008 - in doctools/trunk: Doc-26/library/test.rst Doc-3k/library/test.rst

[georg.brandl]

Author: georg.brandl
Date: Tue Aug 14 08:47:49 2007
New Revision: 57008

Modified:
   doctools/trunk/Doc-26/library/test.rst
   doctools/trunk/Doc-3k/library/test.rst
Log:
Port rev. 57000, 57007.


Modified: doctools/trunk/Doc-26/library/test.rst
==============================================================================
--- doctools/trunk/Doc-26/library/test.rst	(original)
+++ doctools/trunk/Doc-26/library/test.rst	Tue Aug 14 08:47:49 2007
@@ -268,14 +268,6 @@
    returned. This does not equal a failure since it could be the path to the file.
 
 
-.. function:: guard_warnings_filter()
-
-   Returns a context manager that guards the :mod:`warnings` module's filter
-   settings.
-
-   .. versionadded:: 2.6
-
-
 .. function:: run_unittest(*classes)
 
    Execute :class:`unittest.TestCase` subclasses passed to the function. The
@@ -297,10 +289,11 @@
 
 .. class:: TransientResource(exc[, **kwargs])
 
-   Create a context manager that raises :class:`ResourceDenied` if the specified
-   exception type is raised.  Any keyword arguments are treated as name/value pairs
-   to be compared against any exception raised with the ``with`` statement.  Only
-   if all pairs match is :class:`ResourceDenied` raised.
+   Instances are a context manager that raises :exc:`ResourceDenied` if the
+   specified exception type is raised.  Any keyword arguments are treated as
+   attribute/value pairs to be compared against any exception raised within the
+   :keyword:`with` statement.  Only if all pairs match properly against
+   attributes on the exception is :exc:`ResourceDenied` raised.
 
    .. versionadded:: 2.6
 

Modified: doctools/trunk/Doc-3k/library/test.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/test.rst	(original)
+++ doctools/trunk/Doc-3k/library/test.rst	Tue Aug 14 08:47:49 2007
@@ -268,14 +268,6 @@
    returned. This does not equal a failure since it could be the path to the file.
 
 
-.. function:: guard_warnings_filter()
-
-   Returns a context manager that guards the :mod:`warnings` module's filter
-   settings.
-
-   .. versionadded:: 2.6
-
-
 .. function:: run_unittest(*classes)
 
    Execute :class:`unittest.TestCase` subclasses passed to the function. The
@@ -297,10 +289,11 @@
 
 .. class:: TransientResource(exc[, **kwargs])
 
-   Create a context manager that raises :class:`ResourceDenied` if the specified
-   exception type is raised.  Any keyword arguments are treated as name/value pairs
-   to be compared against any exception raised with the ``with`` statement.  Only
-   if all pairs match is :class:`ResourceDenied` raised.
+   Instances are a context manager that raises :exc:`ResourceDenied` if the
+   specified exception type is raised.  Any keyword arguments are treated as
+   attribute/value pairs to be compared against any exception raised within the
+   :keyword:`with` statement.  Only if all pairs match properly against
+   attributes on the exception is :exc:`ResourceDenied` raised.
 
    .. versionadded:: 2.6