From: Georg Brandl <georg@python.org>
Date: Mon, 10 May 2010 21:50:57 +0000 (+0000)
Subject: Consolidate deprecation messages.
X-Git-Tag: v2.7rc1~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f635f41f2aba9e175d9837704071004fc7aceea;p=thirdparty%2FPython%2Fcpython.git

Consolidate deprecation messages.
---

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 06fd78176e0b..102a18778ead 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -776,8 +776,7 @@ Test cases
       will be *msg* if given, otherwise it will be :const:`None`.
 
       .. deprecated:: 2.7
-         :meth:`failUnless`; use one of the ``assert`` variants.
-         :meth:`assert_`; use :meth:`assertTrue`.
+         :meth:`failUnless` and :meth:`assert_`; use :meth:`assertTrue`.
 
 
    .. method:: assertEqual(first, second[, msg])