diff --git a/Lib/idlelib/idle_test/test_redirector.py b/Lib/idlelib/idle_test/test_redirector.py index bd486d7da660108..2e88656e81de1c4 100644 --- a/Lib/idlelib/idle_test/test_redirector.py +++ b/Lib/idlelib/idle_test/test_redirector.py @@ -64,8 +64,11 @@ def tearDown(self): self.redir.close() def test_repr(self): # partly for 100% coverage - self.assertIn('Redirector', repr(self.redir)) - self.assertIn('Original', repr(self.orig_insert)) + self.assertRegex(repr(self.redir), + r"^WidgetRedirector\(Text<.+>\)$") + self.assertRegex( + repr(self.orig_insert), + r"^OriginalCommand\(WidgetRedirector\(Text<.+>\), 'insert'\)$") def test_register(self): self.assertEqual(self.text.get('1.0', 'end'), '\n') diff --git a/Lib/idlelib/redirector.py b/Lib/idlelib/redirector.py index 8e2ba68d3815bf0..821a45ee7982a47 100644 --- a/Lib/idlelib/redirector.py +++ b/Lib/idlelib/redirector.py @@ -48,7 +48,7 @@ def __init__(self, widget): def __repr__(self): w = self.widget - return f"{self.__class__.__name__,}({w.__class__.__name__}<{w._w}>)" + return f"{self.__class__.__name__}({w.__class__.__name__}<{w._w}>)" def close(self): "Unregister operations and revert redirection created by .__init__." @@ -143,7 +143,7 @@ def __init__(self, redir, operation): self.orig_and_operation = (redir.orig, operation) def __repr__(self): - return f"{self.__class__.__name__,}({self.redir!r}, {self.operation!r})" + return f"{self.__class__.__name__}({self.redir!r}, {self.operation!r})" def __call__(self, *args): return self.tk_call(self.orig_and_operation + args) diff --git a/Lib/test/test_email/test_message.py b/Lib/test/test_email/test_message.py index 974b0ceaafbde4e..ea30a94dfda24a0 100644 --- a/Lib/test/test_email/test_message.py +++ b/Lib/test/test_email/test_message.py @@ -582,7 +582,7 @@ def _make_subtype_test_message(self, subtype): ('From', 'bar@foo.com'), ] if subtype != 'no_content': - ('content-shadow', 'Logrus'), + msg_headers.append(('content-shadow', 'Logrus')) msg_headers.append(('X-Random-Header', 'Corwin')) if subtype == 'text': payload = ''