[3.11] gh-116034: fix location info on the error of a failed assertion (#116052)

iritkatriel · web-flow · commit 99ab0d49e205 · 2024-02-28T19:12:16.000Z
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -636,6 +636,23 @@ def f_with_binary_operator():
         result_lines = self.get_exception(f_with_binary_operator)
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_caret_for_failed_assertion(self):
+        def f_assert():
+            test = 3
+            assert test == 1 and test == 2, "Bug found?"
+
+        lineno_f = f_assert.__code__.co_firstlineno
+        expected_error = (
+            'Traceback (most recent call last):\n'
+            f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
+            '    callable()\n'
+            f'  File "{__file__}", line {lineno_f+2}, in f_assert\n'
+            '    assert test == 1 and test == 2, "Bug found?"\n'
+            '           ^^^^^^^^^^^^^^^^^^^^^^^\n'
+        )
+        result_lines = self.get_exception(f_assert)
+        self.assertEqual(result_lines, expected_error.splitlines())
+
     def test_traceback_specialization_with_syntax_error(self):
         bytecode = compile("1 / 0 / 1 / 2\n", TESTFN, "exec")
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-02-28-17-25-19.gh-issue-116034.-Uu9tf.rst b/Misc/NEWS.d/next/Core and Builtins/2024-02-28-17-25-19.gh-issue-116034.-Uu9tf.rst
@@ -0,0 +1 @@
+Fix location of the error on a failed assertion.
diff --git a/Python/compile.c b/Python/compile.c
@@ -4050,6 +4050,7 @@ compiler_assert(struct compiler *c, stmt_ty s)
         ADDOP_I(c, PRECALL, 0);
         ADDOP_I(c, CALL, 0);
     }
+    SET_LOC(c, s->v.Assert.test);
     ADDOP_I(c, RAISE_VARARGS, 1);
     compiler_use_next_block(c, end);
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix location of the error on a failed assertion.`
Original file line number	Diff line number	Diff line change
`@@ -4050,6 +4050,7 @@ compiler_assert(struct compiler *c, stmt_ty s)`
`4050`	`4050`	`ADDOP_I(c, PRECALL, 0);`
`4051`	`4051`	`ADDOP_I(c, CALL, 0);`
`4052`	`4052`	`}`
	`4053`	`+ SET_LOC(c, s->v.Assert.test);`
`4053`	`4054`	`ADDOP_I(c, RAISE_VARARGS, 1);`
`4054`	`4055`	`compiler_use_next_block(c, end);`
`4055`	`4056`	`return 1;`