Add more typing, reduce size of testtools.compat

Author: jelmer

pyproject.toml

@@ -81,8 +81,6 @@ module = [
     # except tests (we're not sadists)
     "testtools.assertions",
     "testtools.compat",
-    "testtools.content",
-    "testtools.content_type",
     "testtools.matchers.*",
     "testtools.monkey",
     "testtools.run",

tests/test_fixturesupport.py

@@ -7,7 +7,6 @@
     content,
     content_type,
 )
-from testtools.compat import _b
 from testtools.matchers import (
     Contains,
     Equals,
@@ -70,7 +69,7 @@ class DetailsFixture(fixtures.Fixture):
             def setUp(self):
                 fixtures.Fixture.setUp(self)
                 self.addCleanup(delattr, self, "content")
-                self.content = [_b("content available until cleanUp")]
+                self.content = [b"content available until cleanUp"]
                 self.addDetail(
                     "content", content.Content(content_type.UTF8_TEXT, self.get_content)
                 )
@@ -86,7 +85,7 @@ def test_foo(self):
                 # Add a colliding detail (both should show up)
                 self.addDetail(
                     "content",
-                    content.Content(content_type.UTF8_TEXT, lambda: [_b("foo")]),
+                    content.Content(content_type.UTF8_TEXT, lambda: [b"foo"]),
                 )
 
         result = ExtendedTestResult()

tests/test_run.py

@@ -11,7 +11,6 @@
 
 import testtools
 from testtools import TestCase, run, skipUnless
-from testtools.compat import _b
 from testtools.matchers import (
     Contains,
     DocTestMatches,
@@ -40,8 +39,7 @@ def __init__(self, broken=False):
             :param broken: If True, the sample file will not be importable.
             """
             if not broken:
-                init_contents = _b(
-                    """\
+                init_contents = b"""\
 from testtools import TestCase
 
 class TestFoo(TestCase):
@@ -53,7 +51,6 @@ def test_suite():
     from unittest import TestLoader
     return TestLoader().loadTestsFromName(__name__)
 """
-                )
             else:
                 init_contents = b"class not in\n"
             self.package = fixtures.PythonPackage(
@@ -80,8 +77,7 @@ def __init__(self):
                 [
                     (
                         "__init__.py",
-                        _b(
-                            """
+                        b"""
 from fixtures import Fixture
 from testresources import (
     FixtureResource,
@@ -112,8 +108,7 @@ def test_quux(self):
 def test_suite():
     from unittest import TestLoader
     return OptimisingTestSuite(TestLoader().loadTestsFromName(__name__))
-"""
-                        ),
+""",
                     )
                 ],
             )
@@ -137,8 +132,7 @@ def __init__(self):
                 [
                     (
                         "__init__.py",
-                        _b(
-                            """
+                        b"""
 from testtools import TestCase, clone_test_with_new_id
 
 class TestExample(TestCase):
@@ -148,8 +142,7 @@ def test_foo(self):
 def load_tests(loader, tests, pattern):
     tests.addTest(clone_test_with_new_id(tests._tests[1]._tests[0], "fred"))
     return tests
-"""
-                        ),
+""",
                     )
                 ],
             )
@@ -288,12 +281,10 @@ def test_run_orders_tests(self):
         f = open(tempname, "wb")
         try:
             f.write(
-                _b(
-                    """
+                b"""
 testtools.runexample.TestFoo.test_bar
 testtools.runexample.missingtest
 """
-                )
             )
         finally:
             f.close()
@@ -328,12 +319,10 @@ def test_run_load_list(self):
         f = open(tempname, "wb")
         try:
             f.write(
-                _b(
-                    """
+                b"""
 testtools.runexample.TestFoo.test_bar
 testtools.runexample.missingtest
 """
-                )
             )
         finally:
             f.close()
@@ -368,12 +357,10 @@ def test_load_list_preserves_custom_suites(self):
         f = open(tempname, "wb")
         try:
             f.write(
-                _b(
-                    """
+                b"""
 testtools.resourceexample.TestFoo.test_bar
 testtools.resourceexample.TestFoo.test_foo
 """
-                )
             )
         finally:
             f.close()

testtools/compat.py

@@ -1,47 +1,19 @@
 # Copyright (c) 2008-2015 testtools developers. See LICENSE for details.
 
-"""Compatibility support for python 2 and 3."""
+"""Compatibility support - kept for backwards compatibility."""
 
 __all__ = [
     "BytesIO",
     "StringIO",
-    "_b",
-    "advance_iterator",
-    "reraise",
+    "text_repr",
     "unicode_output_stream",
 ]
 
 import codecs
 import io
-import locale
-import os
 import sys
-import types
 import unicodedata
 from io import BytesIO, StringIO  # for backwards-compat
-from typing import Any, NoReturn
-
-
-def reraise(
-    exc_class: type[BaseException],
-    exc_obj: BaseException,
-    exc_tb: types.TracebackType,
-    _marker: Any = object(),
-) -> NoReturn:
-    """Re-raise an exception received from sys.exc_info() or similar."""
-    raise exc_obj.with_traceback(exc_tb)
-
-
-def _u(s):
-    return s
-
-
-def _b(s):
-    """A byte literal."""
-    return s.encode("latin-1")
-
-
-advance_iterator = next
 
 
 def _slow_escape(text):
@@ -149,15 +121,3 @@ def unicode_output_stream(stream):
     except AttributeError:
         pass
     return writer(stream, "replace")
-
-
-def _get_exception_encoding():
-    """Return the encoding we expect messages from the OS to be encoded in"""
-    if os.name == "nt":
-        # GZ 2010-05-24: Really want the codepage number instead, the error
-        #                handling of standard codecs is more deterministic
-        return "mbcs"
-    # GZ 2010-05-23: We need this call to be after initialisation, but there's
-    #                no benefit in asking more than once as it's a global
-    #                setting that can change after the message is formatted.
-    return locale.getlocale(locale.LC_MESSAGES)[1] or "ascii"