diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-10-04 20:07:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-10-04 20:07:34 (GMT) |
| commit | 9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9 (patch) | |
| tree | 967a76946006629b4b16689bbd6cb0f98f2b6bf8 /Doc | |
| parent | 2e30440153dbd7864fa2201a43a48ebfec66b14b (diff) | |
| download | cpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.zip cpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.tar.gz cpython-9a779ea98ec7c0edff9fa9ff4a60b1fcc589a2b9.tar.bz2 | |
Merged revisions 74524,74556 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74524 | gregory.p.smith | 2009-08-20 04:39:38 -0500 (Thu, 20 Aug 2009) | 2 lines
Add weakref support to the thread.lock type.
........
r74556 | kristjan.jonsson | 2009-08-27 17:20:21 -0500 (Thu, 27 Aug 2009) | 2 lines
issue 6275
Add an "exc_value" attribute to the _AssertRaisesContext context manager in the unittest package. This allows further tests on the exception that was raised after the context manager exits.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/unittest.rst | 4 | ||||
| -rw-r--r-- | Doc/library/weakref.rst | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index fefae04..494c2d7 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -891,6 +891,10 @@ Test cases with self.failUnlessRaises(some_error_class): do_something() + The context manager will store the caught exception object in its + :attr:`exc_value` attribute. This can be useful if the intention + is to perform additional checks on the exception raised. + .. versionchanged:: 3.1 Added the ability to use :meth:`assertRaises` as a context manager. diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst index 9aaa58a..d4751b1 100644 --- a/Doc/library/weakref.rst +++ b/Doc/library/weakref.rst @@ -61,6 +61,9 @@ instances, functions written in Python (but not in C), instance methods, sets, frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays, deques, and regular expression pattern objects. +.. versionchanged:: 2.7 + Added support for thread.lock and threading.Lock. + Several built-in types such as :class:`list` and :class:`dict` do not directly support weak references but can add support through subclassing:: |