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.
........
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 @@
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 @@
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::