1
diff --git a/src/maastesting/__init__.py b/src/maastesting/__init__.py
2
index 8d8856c..6133ab5 100644
3
--- a/src/maastesting/__init__.py
4
+++ b/src/maastesting/__init__.py
5
@@ -44,11 +44,3 @@ filterwarnings("ignore", category=DeprecationWarning, module=r"^twisted\b")
6
44
sentinel_type = type(mock.sentinel.foo)
44
sentinel_type = type(mock.sentinel.foo)
7
45
copy._copy_dispatch[sentinel_type] = copy._copy_immutable
45
copy._copy_dispatch[sentinel_type] = copy._copy_immutable
8
46
copy._deepcopy_dispatch[sentinel_type] = copy._copy_immutable
46
copy._deepcopy_dispatch[sentinel_type] = copy._copy_immutable
9
47
10
48
# Monkey-patch test dependencies here.
11
49
from maastesting.twisted import (  # noqa:E402 isort:skip
12
50
    maybe_fix_bug_230_in_CaptureTwistedLogs,
13
51
)
14
52
15
53
maybe_fix_bug_230_in_CaptureTwistedLogs()
16
54
del maybe_fix_bug_230_in_CaptureTwistedLogs
17
diff --git a/src/maastesting/twisted.py b/src/maastesting/twisted.py
18
index 7983106..ef5ae2b 100644
19
--- a/src/maastesting/twisted.py
20
+++ b/src/maastesting/twisted.py
21
@@ -11,12 +11,9 @@ __all__ = [
22
11
]
11
]
23
12
12
24
13
from copy import copy
13
from copy import copy
25
14
import inspect
26
15
from textwrap import dedent
27
16
14
28
17
from fixtures import Fixture
15
from fixtures import Fixture
29
18
from testtools.content import Content, UTF8_TEXT
16
from testtools.content import Content, UTF8_TEXT
30
19
from testtools.deferredruntest import CaptureTwistedLogs
31
20
from testtools.monkey import patch
17
from testtools.monkey import patch
32
21
from testtools.twistedsupport._deferred import extract_result
18
from testtools.twistedsupport._deferred import extract_result
33
22
from twisted.internet import defer
19
from twisted.internet import defer
34
@@ -24,21 +21,6 @@ from twisted.logger import formatEvent, globalLogPublisher, LogLevel
35
24
from twisted.python import log
21
from twisted.python import log
36
25
22
37
26
23
38
27
def maybe_fix_bug_230_in_CaptureTwistedLogs():
39
28
    """Fix a bug in testtools's `CaptureTwistedLogs`.
40
29
41
30
    Specifically "TypeError: CaptureTwistedLogs puts strings into details",
42
31
    https://github.com/testing-cabal/testtools/issues/230. At the time of
43
32
    writing this has been fixed upstream but not released.
44
33
    """
45
34
    source = inspect.getsource(CaptureTwistedLogs._setUp)
46
35
    if "[logs.getvalue()]" in source:
47
36
        source = source.replace("getvalue()", "getvalue().encode('utf-8')")
48
37
        namespace = CaptureTwistedLogs._setUp.__globals__.copy()
49
38
        exec(dedent(source), namespace)
50
39
        CaptureTwistedLogs._setUp = namespace["_setUp"]
51
40
52
41
53
42
class TwistedLoggerFixture(Fixture):
24
class TwistedLoggerFixture(Fixture):
54
43
    """Capture all Twisted logging.
25
    """Capture all Twisted logging.
55
44
26
Status:	Merged
Approved by:	Dougal Matthews on 2020-11-11
Approved revision:	3bea79fdd5d3f0f1b8f88e0677f3f16963072bed
Merge reported by:	MAAS Lander
Merged at revision:	not available
Proposed branch:	~d0ugal/maas:testtools-monkeypatch
Merge into:	maas:master
Diff against target:	54 lines (+0/-26) 2 files modified src/maastesting/__init__.py (+0/-8) src/maastesting/twisted.py (+0/-18)
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
MAAS Lander		Approve on 2020-11-11
Alberto Donato (community)	2020-11-10	Approve on 2020-11-10
Review via email: mp+393565@code.launchpad.net