From: John Belmonte <john@neggie.net>
Date: Mon, 11 Jul 2022 09:22:41 +0000 (+0900)
Subject: gh-93883: Fix some tests involving traceback formatting (#94737)
X-Git-Tag: v3.12.0a1~979
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fdc35ef519855e1b69addf43af74f3ac7f37a6f;p=thirdparty%2FPython%2Fcpython.git

gh-93883: Fix some tests involving traceback formatting (#94737)

PR #93994 was merged without being rebased in a few weeks, and
some new test code using the old scheme passed through automatic merge.
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 602bd2cae0a9..ef08b29c6d36 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -740,7 +740,6 @@ class TracebackErrorLocationCaretTests(unittest.TestCase):
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    .method",
             f"     ^^^^^^",
@@ -757,10 +756,8 @@ class TracebackErrorLocationCaretTests(unittest.TestCase):
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    method",
-            f"    ^^^^^^",
         ]
         self.assertEqual(actual, expected)
 
@@ -774,7 +771,6 @@ class TracebackErrorLocationCaretTests(unittest.TestCase):
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    . method",
             f"      ^^^^^^",