[Python-checkins] cpython (merge 3.2 -> default): #11282: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/110bb604bc2f
changeset:   69110:110bb604bc2f
parent:      69108:ca5932a51a9b
parent:      69109:1fd736395df3
user:        Ezio Melotti
date:        Sun Apr 03 17:39:19 2011 +0300
summary:
  #11282: merge with 3.2.

files:
  Doc/library/unittest.rst       |  2 +-
  Lib/unittest/case.py           |  3 +--
  Lib/unittest/test/test_case.py |  6 ++----
  3 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1462,7 +1462,7 @@
     :meth:`.assertRaisesRegex`                             assertRaisesRegexp
    ==============================  ====================== ======================
 
-   .. deprecated-removed:: 3.1 3.3
+   .. deprecated:: 3.1
          the fail* aliases listed in the second column.
    .. deprecated:: 3.2
          the assert* aliases listed in the third column.
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -1110,8 +1110,7 @@
             return original_func(*args, **kwargs)
         return deprecated_func
 
-    # The fail* methods can be removed in 3.3, the 5 assert* methods will
-    # have to stay around for a few more versions.  See #9424.
+    # see #9424
     assertEquals = _deprecate(assertEqual)
     assertNotEquals = _deprecate(assertNotEqual)
     assertAlmostEquals = _deprecate(assertAlmostEqual)
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -1093,10 +1093,8 @@
                     _runtime_warn("barz")
 
     def testDeprecatedMethodNames(self):
-        """Test that the deprecated methods raise a DeprecationWarning.
-
-        The fail* methods will be removed in 3.3. The assert* methods will
-        have to stay around for a few more versions.  See #9424.
+        """
+        Test that the deprecated methods raise a DeprecationWarning. See #9424.
         """
         old = (
             (self.assertNotEquals, (3, 5)),

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