Update versions (#92557)

serhiy-storchaka · web-flow · commit c7f38bb66a33 · 2022-05-09T15:42:12.000+03:00
This reverts commit b50322d.
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
@@ -1808,7 +1808,7 @@ Loading and running tests
       .. versionchanged:: 3.5
          Support for a keyword-only argument *pattern* has been added.
 
-      .. versionchanged:: 3.11
+      .. versionchanged:: 3.12
          The undocumented and unofficial *use_load_tests* parameter has been
          removed.
 
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -107,6 +107,27 @@ Deprecated
 Removed
 =======
 
+* Removed many old deprecated :mod:`unittest` features:
+
+  - :class:`~unittest.TestCase` method aliases ``failUnlessEqual``,
+    ``failIfEqual``, ``failUnless``, ``failIf``, ``failUnlessRaises``,
+    ``failUnlessAlmostEqual``, ``failIfAlmostEqual`` (deprecated in Python 3.1),
+    ``assertEquals``, ``assertNotEquals``, ``assert_``, ``assertAlmostEquals``,
+    ``assertNotAlmostEquals``, ``assertRegexpMatches``, ``assertRaisesRegexp``
+    (deprecated in Python 3.2), and ``assertNotRegexpMatches`` (deprecated in
+    Python 3.5).
+
+  - Undocumented and broken :class:`~unittest.TestCase` method
+    ``assertDictContainsSubset`` (deprecated in Python 3.2).
+
+  - Undocumented :meth:`<unittest.TestLoader.loadTestsFromModule>
+    TestLoader.loadTestsFromModule` parameter *use_load_tests* (deprecated
+    and ignored since Python 3.2).
+
+  - An alias of the :class:`~unittest.TextTestResult` class:
+    ``_TextTestResult`` (deprecated in Python 3.2).
+
+  (Contributed by Serhiy Storchaka in :issue:`89325`.)
 
 
 Porting to Python 3.12
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
@@ -1761,7 +1761,7 @@ def testAssertNoLogsYieldsNone(self):
         self.assertIsNone(value)
 
     def testDeprecatedFailMethods(self):
-        """Test that the deprecated fail* methods get removed in 3.11"""
+        """Test that the deprecated fail* methods get removed in 3.12"""
         deprecated_names = [
             'failIfEqual', 'failUnlessEqual', 'failUnlessAlmostEqual',
             'failIfAlmostEqual', 'failUnless', 'failUnlessRaises', 'failIf',
diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py
@@ -176,7 +176,7 @@ def load_tests(loader, tests, pattern):
         self.assertIsInstance(suite, unittest.TestSuite)
         self.assertEqual(load_tests_args, [loader, suite, None])
 
-        # In Python 3.11, the undocumented and unofficial use_load_tests has
+        # In Python 3.12, the undocumented and unofficial use_load_tests has
         # been removed.
         with self.assertRaises(TypeError):
             loader.loadTestsFromModule(m, False)
