#11282: merge with 3.2.

diff --cc Doc/library/unittest.rst
Simple merge

diff --cc Lib/unittest/case.py
index 4e477076b9a646140d36316356d8da0c67bfd552,01c5a7bc2f4769edde2cae6d633d5c0b55513ed7..4d6b8f58958d511cef07f4f49d89dc4e383d9507
--- 1/Lib/unittest/case.py
--- 2/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@@ -1110,13 -1181,14 +1110,12 @@@ class TestCase(object)
              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
 -    failUnlessEqual = assertEquals = _deprecate(assertEqual)
 -    failIfEqual = assertNotEquals = _deprecate(assertNotEqual)
 -    failUnlessAlmostEqual = assertAlmostEquals = _deprecate(assertAlmostEqual)
 -    failIfAlmostEqual = assertNotAlmostEquals = _deprecate(assertNotAlmostEqual)
 -    failUnless = assert_ = _deprecate(assertTrue)
 -    failUnlessRaises = _deprecate(assertRaises)
 -    failIf = _deprecate(assertFalse)
 +    assertEquals = _deprecate(assertEqual)
 +    assertNotEquals = _deprecate(assertNotEqual)
 +    assertAlmostEquals = _deprecate(assertAlmostEqual)
 +    assertNotAlmostEquals = _deprecate(assertNotAlmostEqual)
 +    assert_ = _deprecate(assertTrue)
      assertRaisesRegexp = _deprecate(assertRaisesRegex)
      assertRegexpMatches = _deprecate(assertRegex)
  

diff --cc Lib/unittest/test/test_case.py
index 852ac86f0dfafc2b802e38b542e7c87088500b47,1db433f32c7ab37f35ab8a9754bce20cc4a13976..bd804c005640dc24c91c962b8d2f9d9f33cdb131
--- 1/Lib/unittest/test/test_case.py
--- 2/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@@ -1093,17 -1088,24 +1093,15 @@@ test cas
                      _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.failIfEqual, (3, 5)),
              (self.assertNotEquals, (3, 5)),
 -            (self.failUnlessEqual, (3, 3)),
              (self.assertEquals, (3, 3)),
 -            (self.failUnlessAlmostEqual, (2.0, 2.0)),
              (self.assertAlmostEquals, (2.0, 2.0)),
 -            (self.failIfAlmostEqual, (3.0, 5.0)),
              (self.assertNotAlmostEquals, (3.0, 5.0)),
 -            (self.failUnless, (True,)),
              (self.assert_, (True,)),
 -            (self.failUnlessRaises, (TypeError, lambda _: 3.14 + 'spam')),
 -            (self.failIf, (False,)),
 -            (self.assertSameElements, ([1, 1, 2, 3], [1, 2, 3])),
 -            (self.assertDictContainsSubset, (dict(a=1, b=2), dict(a=1, b=2, c=3))),
              (self.assertRaisesRegexp, (KeyError, 'foo', lambda: {}['foo'])),
              (self.assertRegexpMatches, ('bar', 'bar')),
          )