Remove deprecated classes, methods

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

NEWS

@@ -11,6 +11,29 @@ Changes
 
 * Drop support for Python 3.8. (Stephen Finucane)
 
+* Remove a number of deprecated classes and methods. (Stephen Finucane)
+
+  * ``testtools.matchers``
+
+    * ``AfterPreproccessing`` (use ``AfterPreprocessing``)
+
+  * ``testtools.testcase``
+
+    * ``TestSkipped`` (use ``unittest.SkipTest``)
+    * ``TestCase.skip`` (use ``TestCase.skipTest``)
+    * ``TestCase.failUnlessEqual`` (use ``TestCase.assertEqual``)
+    * ``TestCase.assertEquals`` (use ``TestCase.assertEqual``)
+    * ``TestCase.failUnlessRaises`` (use ``TestCase.assertRaises``)
+    * ``TestCase.assertItemsEqual`` (use ``TestCase.assertCountEqual``)
+
+  * ``testtools.testresult.real``
+
+    * ``domap`` (no replacement)
+
+  * ``testtools.twistedsupport._runtest``
+
+    * ``run_with_log_observers`` (no replacement)
+
 2.7.2
 ~~~~~
 

testtools/matchers/_basic.py

@@ -18,7 +18,6 @@
 import operator
 from pprint import pformat
 import re
-import warnings
 
 from ..compat import (
     text_repr,
@@ -71,24 +70,6 @@ def __init__(self, actual, mismatch_string, reference, reference_on_right=True):
         self._reference = reference
         self._reference_on_right = reference_on_right
 
-    @property
-    def expected(self):
-        warnings.warn(
-            f"{self.__class__.__name__}.expected deprecated after 1.8.1",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self._reference
-
-    @property
-    def other(self):
-        warnings.warn(
-            f"{self.__class__.__name__}.other deprecated after 1.8.1",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self._actual
-
     def describe(self):
         actual = repr(self._actual)
         reference = repr(self._reference)

testtools/matchers/_exception.py

@@ -9,7 +9,7 @@
 import sys
 
 from ._basic import MatchesRegex
-from ._higherorder import AfterPreproccessing
+from ._higherorder import AfterPreprocessing
 from ._impl import (
     Matcher,
     Mismatch,
@@ -47,7 +47,7 @@ def __init__(self, exception, value_re=None):
         Matcher.__init__(self)
         self.expected = exception
         if isinstance(value_re, str):
-            value_re = AfterPreproccessing(str, MatchesRegex(value_re), False)
+            value_re = AfterPreprocessing(str, MatchesRegex(value_re), False)
         self.value_re = value_re
         expected_type = type(self.expected)
         self._is_instance = not any(

testtools/matchers/_higherorder.py

@@ -212,11 +212,6 @@ def match(self, value):
         return matcher.match(after)
 
 
-# This is the old, deprecated. spelling of the name, kept for backwards
-# compatibility.
-AfterPreproccessing = AfterPreprocessing
-
-
 class AllMatch:
     """Matches if all provided values match the given matcher."""
 

testtools/testcase.py

@@ -22,7 +22,6 @@
 import types
 import unittest
 from unittest.case import SkipTest
-import warnings
 
 from testtools.compat import reraise
 from testtools import content
@@ -50,18 +49,6 @@
 )
 
 
-class TestSkipped(SkipTest):
-    """Raised within TestCase.run() when a test is skipped."""
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn(
-            "Use SkipTest from unittest instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        super().__init__(*args, **kwargs)
-
-
 class _UnexpectedSuccess(Exception):
     """An unexpected success was raised.
 
@@ -293,17 +280,6 @@ def __repr__(self):
         # We add id to the repr because it makes testing testtools easier.
         return f"<{self.id()} id=0x{id(self):0x}>"
 
-    def _deprecate(original_func):
-        def deprecated_func(*args, **kwargs):
-            warnings.warn(
-                "Please use {0} instead.".format(original_func.__name__),
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            return original_func(*args, **kwargs)
-
-        return deprecated_func
-
     def addDetail(self, name, content_object):
         """Add a detail to be reported with this test's outcome.
 
@@ -355,15 +331,6 @@ def skipTest(self, reason):
         """
         raise self.skipException(reason)
 
-    def skip(self, reason):
-        """DEPRECATED: Use skipTest instead."""
-        warnings.warn(
-            "Only valid in 1.8.1 and earlier. Use skipTest instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self.skipTest(reason)
-
     def _formatTypes(self, classOrIterable):
         """Format a class or a bunch of classes for display in an error."""
         className = getattr(classOrIterable, "__name__", None)
@@ -418,8 +385,6 @@ def assertEqual(self, expected, observed, message=""):
         matcher = _FlippedEquals(expected)
         self.assertThat(observed, matcher, message)
 
-    failUnlessEqual = assertEquals = _deprecate(assertEqual)
-
     def assertIn(self, needle, haystack, message=""):
         """Assert that needle is in haystack."""
         self.assertThat(haystack, Contains(needle), message)
@@ -495,8 +460,6 @@ def match(self, matchee):
         self.assertThat(our_callable, matcher)
         return capture.matchee
 
-    failUnlessRaises = _deprecate(assertRaises)
-
     def assertThat(self, matchee, matcher, message="", verbose=False):
         """Assert that matchee is matched by matcher.
 
@@ -508,8 +471,6 @@ def assertThat(self, matchee, matcher, message="", verbose=False):
         if mismatch_error is not None:
             raise mismatch_error
 
-    assertItemsEqual = _deprecate(unittest.TestCase.assertCountEqual)
-
     def addDetailUniqueName(self, name, content_object):
         """Add a detail to the test, but ensure it's name is unique.
 

testtools/testresult/real.py

@@ -28,7 +28,6 @@
 from operator import methodcaller
 import sys
 import unittest
-import warnings
 
 from testtools.compat import _b
 from testtools.content import (
@@ -436,21 +435,6 @@ def status(
         """
 
 
-def domap(function, *sequences):
-    """A strict version of 'map' that's guaranteed to run on all inputs.
-
-    DEPRECATED since testtools 1.8.1: Internal code should use _strict_map.
-    External code should look for other solutions for their strict mapping
-    needs.
-    """
-    warnings.warn(
-        "domap deprecated since 1.8.1. Please implement your own strict map.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return _strict_map(function, *sequences)
-
-
 def _strict_map(function, *sequences):
     return list(map(function, *sequences))
 

testtools/tests/test_testcase.py

@@ -41,7 +41,6 @@
     attr,
     Nullary,
     WithAttributes,
-    TestSkipped,
 )
 from testtools.testresult.doubles import (
     Python26TestResult,
@@ -304,7 +303,7 @@ def test_identicalIsEqual(self):
 
     def test_nonIdenticalInUnequal(self):
         # TestCase's are not equal if they are not identical.
-        self.assertNotEqual(TestCase(methodName="run"), TestCase(methodName="skip"))
+        self.assertNotEqual(TestCase(methodName="run"), TestCase(methodName="skipTest"))
 
 
 class TestAssertions(TestCase):
@@ -804,16 +803,12 @@ def test_assertEqual_nice_formatting(self):
             ]
         )
         self.assertFails(expected_error, self.assertEqual, a, b, message)
-        self.assertFails(expected_error, self.assertEquals, a, b, message)
-        self.assertFails(expected_error, self.failUnlessEqual, a, b, message)
 
     def test_assertEqual_formatting_no_message(self):
         a = "cat"
         b = "dog"
         expected_error = "'cat' != 'dog'"
         self.assertFails(expected_error, self.assertEqual, a, b)
-        self.assertFails(expected_error, self.assertEquals, a, b)
-        self.assertFails(expected_error, self.failUnlessEqual, a, b)
 
     def test_assertEqual_non_ascii_str_with_newlines(self):
         message = "Be careful mixing unicode and bytes"
@@ -1817,8 +1812,8 @@ def test_that_is_decorated_with_skip(self):
         result = Python26TestResult(events)
         try:
             test = SkippingTest("test_that_is_decorated_with_skip")
-        except TestSkipped:
-            self.fail("TestSkipped raised")
+        except unittest.SkipTest:
+            self.fail("SkipTest raised")
         test.run(result)
         self.assertEqual("addSuccess", events[1][0])
 
@@ -1832,8 +1827,8 @@ def test_that_is_decorated_with_skipIf(self):
         result = Python26TestResult(events)
         try:
             test = SkippingTest("test_that_is_decorated_with_skipIf")
-        except TestSkipped:
-            self.fail("TestSkipped raised")
+        except unittest.SkipTest:
+            self.fail("SkipTest raised")
         test.run(result)
         self.assertEqual("addSuccess", events[1][0])
 
@@ -1847,8 +1842,8 @@ def test_that_is_decorated_with_skipUnless(self):
         result = Python26TestResult(events)
         try:
             test = SkippingTest("test_that_is_decorated_with_skipUnless")
-        except TestSkipped:
-            self.fail("TestSkipped raised")
+        except unittest.SkipTest:
+            self.fail("SkipTest raised")
         test.run(result)
         self.assertEqual("addSuccess", events[1][0])
 
@@ -1882,8 +1877,8 @@ def test_skipped(self):
 
         try:
             test = SkippingTestCase("test_skipped")
-        except TestSkipped:
-            self.fail("TestSkipped raised")
+        except unittest.SkipTest:
+            self.fail("SkipTest raised")
         self.check_test_does_not_run_setup(test, reason)
 
     def check_test_does_not_run_setup(self, test, reason):

testtools/tests/twistedsupport/test_runtest.py

@@ -961,19 +961,6 @@ def check_result(failure):
         )
 
 
-class TestRunWithLogObservers(NeedsTwistedTestCase):
-    def test_restores_observers(self):
-        from testtools.twistedsupport._runtest import run_with_log_observers
-        from twisted.python import log
-
-        # Make sure there's at least one observer.  This reproduces bug
-        # #926189.
-        log.addObserver(lambda *args: None)
-        observers = list(log.theLogPublisher.observers)
-        run_with_log_observers([], lambda: None)
-        self.assertEqual(observers, log.theLogPublisher.observers)
-
-
 class TestNoTwistedLogObservers(NeedsTwistedTestCase):
     """Tests for _NoTwistedLogObservers."""
 

testtools/tests/twistedsupport/test_spinner.py

@@ -155,7 +155,7 @@ def test_preserve_signal_handler(self):
             signal.signal(sig, hdlr)
         spinner = self.make_spinner()
         spinner.run(self.make_timeout(), lambda: None)
-        self.assertItemsEqual(new_hdlrs, list(map(signal.getsignal, signals)))
+        self.assertCountEqual(new_hdlrs, list(map(signal.getsignal, signals)))
 
     def test_timeout(self):
         # If the function takes too long to run, we raise a

testtools/twistedsupport/_runtest.py

@@ -27,7 +27,6 @@ def test_something(self):
 ]
 
 import io
-import warnings
 import sys
 
 from fixtures import CompoundFixture, Fixture
@@ -182,18 +181,6 @@ def _setUp(self):
         )
 
 
-def run_with_log_observers(observers, function, *args, **kwargs):
-    """Run 'function' with the given Twisted log observers."""
-    warnings.warn(
-        "run_with_log_observers is deprecated since 1.8.2.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    with _NoTwistedLogObservers():
-        with _TwistedLogObservers(observers):
-            return function(*args, **kwargs)
-
-
 # Observer of the Twisted log that we install during tests.
 #
 # This is a global so that users can call flush_logged_errors errors in their