From 77c357ec4039c26e6ebe730087ddd2e0350efd98 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Fri, 21 Jan 2022 16:12:20 +0300 Subject: [PATCH 1/3] bpo-46425: fix direct invocation of `test_traceback` --- Lib/test/test_traceback.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index a0e4656d3d9eaa..2835503016c35a 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -18,6 +18,7 @@ import traceback from functools import partial +MODULE_PREFIX = f"{__name__}." if __name__ == '__main__' else '' test_code = namedtuple('code', ['co_filename', 'co_name']) test_code.co_positions = lambda _: iter([(6, 6, 0, 0)]) @@ -1311,8 +1312,8 @@ def __str__(self): err = self.get_report(A.B.X()) str_value = 'I am X' str_name = '.'.join([A.B.X.__module__, A.B.X.__qualname__]) - exp = "%s: %s\n" % (str_name, str_value) - self.assertEqual(exp, err) + exp = f"{str_name}: {str_value}\n" + self.assertEqual(exp, MODULE_PREFIX + err) def test_exception_modulename(self): class X(Exception): @@ -1349,7 +1350,7 @@ def __str__(self): err = self.get_report(X()) str_value = '' str_name = '.'.join([X.__module__, X.__qualname__]) - self.assertEqual(err, f"{str_name}: {str_value}\n") + self.assertEqual(MODULE_PREFIX + err, f"{str_name}: {str_value}\n") # #### Exception Groups #### From 6759313190196b74aea536dff697666e6548cb59 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Fri, 21 Jan 2022 16:17:03 +0300 Subject: [PATCH 2/3] Revert f-string --- Lib/test/test_traceback.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 2835503016c35a..fcbbae46b27ad8 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -1312,7 +1312,7 @@ def __str__(self): err = self.get_report(A.B.X()) str_value = 'I am X' str_name = '.'.join([A.B.X.__module__, A.B.X.__qualname__]) - exp = f"{str_name}: {str_value}\n" + exp = "%s: %s\n" % (str_name, str_value) self.assertEqual(exp, MODULE_PREFIX + err) def test_exception_modulename(self): From 95d5e6186da48c657296e6f80bc5cad9dd4c1c33 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Fri, 21 Jan 2022 16:57:41 +0300 Subject: [PATCH 3/3] Update test_traceback.py --- Lib/test/test_traceback.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index fcbbae46b27ad8..966ff2a1241ca6 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -18,7 +18,7 @@ import traceback from functools import partial -MODULE_PREFIX = f"{__name__}." if __name__ == '__main__' else '' +MODULE_PREFIX = f'{__name__}.' if __name__ == '__main__' else '' test_code = namedtuple('code', ['co_filename', 'co_name']) test_code.co_positions = lambda _: iter([(6, 6, 0, 0)])