Merge ~d0ugal/maas:testtools-monkeypatch into maas:master

[Dougal Matthews]

Remove the testtools monkeypatch that maybe fixed a bug

The upstream fix was landed in 2016 and included in testtools 2.4.0

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b testtools-monkeypatch lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8655/console
COMMIT: 626bd4a707e99aebfa47f184e6bd001cad794093

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b testtools-monkeypatch lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 3bea79fdd5d3f0f1b8f88e0677f3f16963072bed

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b testtools-monkeypatch lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8664/consoleText

diff --git a/src/maastesting/__init__.py b/src/maastesting/__init__.py
index 8d8856c..6133ab5 100644
--- a/src/maastesting/__init__.py
+++ b/src/maastesting/__init__.py
@@ -44,11 +44,3 @@ filterwarnings("ignore", category=DeprecationWarning, module=r"^twisted\b")
 sentinel_type = type(mock.sentinel.foo)
 copy._copy_dispatch[sentinel_type] = copy._copy_immutable
 copy._deepcopy_dispatch[sentinel_type] = copy._copy_immutable
-
-# Monkey-patch test dependencies here.
-from maastesting.twisted import (  # noqa:E402 isort:skip
-    maybe_fix_bug_230_in_CaptureTwistedLogs,
-)
-
-maybe_fix_bug_230_in_CaptureTwistedLogs()
-del maybe_fix_bug_230_in_CaptureTwistedLogs
diff --git a/src/maastesting/twisted.py b/src/maastesting/twisted.py
index 7983106..ef5ae2b 100644
--- a/src/maastesting/twisted.py
+++ b/src/maastesting/twisted.py
@@ -11,12 +11,9 @@ __all__ = [
 ]
 
 from copy import copy
-import inspect
-from textwrap import dedent
 
 from fixtures import Fixture
 from testtools.content import Content, UTF8_TEXT
-from testtools.deferredruntest import CaptureTwistedLogs
 from testtools.monkey import patch
 from testtools.twistedsupport._deferred import extract_result
 from twisted.internet import defer
@@ -24,21 +21,6 @@ from twisted.logger import formatEvent, globalLogPublisher, LogLevel
 from twisted.python import log
 
 
-def maybe_fix_bug_230_in_CaptureTwistedLogs():
-    """Fix a bug in testtools's `CaptureTwistedLogs`.
-
-    Specifically "TypeError: CaptureTwistedLogs puts strings into details",
-    https://github.com/testing-cabal/testtools/issues/230. At the time of
-    writing this has been fixed upstream but not released.
-    """
-    source = inspect.getsource(CaptureTwistedLogs._setUp)
-    if "[logs.getvalue()]" in source:
-        source = source.replace("getvalue()", "getvalue().encode('utf-8')")
-        namespace = CaptureTwistedLogs._setUp.__globals__.copy()
-        exec(dedent(source), namespace)
-        CaptureTwistedLogs._setUp = namespace["_setUp"]
-
-
 class TwistedLoggerFixture(Fixture):
     """Capture all Twisted logging.