[Python-checkins] cpython (merge 3.3 -> default): #18894: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/5fbb01033a08
changeset:   85587:5fbb01033a08
parent:      85584:98f82b124c7d
parent:      85586:c3a2c0504960
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 07 15:20:03 2013 +0300
summary:
  #18894: merge with 3.3.

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


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1674,8 +1674,7 @@
 
       A list containing 2-tuples of :class:`TestCase` instances and strings
       holding formatted tracebacks. Each tuple represents a test where a failure
-      was explicitly signalled using the :meth:`TestCase.fail\*` or
-      :meth:`TestCase.assert\*` methods.
+      was explicitly signalled using the :meth:`TestCase.assert\*` methods.
 
    .. attribute:: skipped
 

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