[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/852e824c7093
changeset:   84867:852e824c7093
parent:      84864:35c88c53cf64
parent:      84866:55dcf9e065be
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Jul 27 16:15:51 2013 -0400
summary:
  Merge with 3.3

files:
  Doc/library/unittest.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -985,7 +985,7 @@
          with self.assertWarns(SomeWarning):
              do_something()
 
-      When used as a context manager, :meth:`assertRaises` accepts the
+      When used as a context manager, :meth:`assertWarns` accepts the
       additional keyword argument *msg*.
 
       The context manager will store the caught warning object in its

-- 
Repository URL: http://hg.python.org/cpython