(original) (raw)

changeset: 85587:5fbb01033a08 parent: 85584:98f82b124c7d parent: 85586:c3a2c0504960 user: Ezio Melotti ezio.melotti@gmail.com date: Sat Sep 07 15:20:03 2013 +0300 files: Doc/library/unittest.rst description: #18894: merge with 3.3. diff -r 98f82b124c7d -r 5fbb01033a08 Doc/library/unittest.rst --- a/Doc/library/unittest.rst Sat Sep 07 10:36:04 2013 +0200 +++ b/Doc/library/unittest.rst Sat Sep 07 15:20:03 2013 +0300 @@ -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 /ezio.melotti@gmail.com