Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-121804: always show error location for SyntaxError's in basic repl (GH-123202) (#123631) 

gh-121804: always show error location for SyntaxError's in basic repl (GH-123202)
(cherry picked from commit 6822cb23c6)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-09-03 15:06:31 +02:00 committed by GitHub
parent d655c65561
commit 48941399e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_repl.py
View File

@ -187,6 +187,19 @@ class TestInteractiveInterpreter(unittest.TestCase):
]
self.assertEqual(traceback_lines, expected_lines)
def test_runsource_show_syntax_error_location(self):
user_input = dedent("""def f(x, x): ...
""")
p = spawn_repl()
p.stdin.write(user_input)
output = kill_python(p)
expected_lines = [
' def f(x, x): ...',
' ^',
"SyntaxError: duplicate argument 'x' in function definition"
]
self.assertEqual(output.splitlines()[4:-1], expected_lines)
def test_interactive_source_is_in_linecache(self):
user_input = dedent("""
def foo(x):

2
Misc/NEWS.d/next/Core and Builtins/2024-08-21-15-22-53.gh-issue-121804.r5K3PS.rst Normal file
View File

@ -0,0 +1,2 @@
Correctly show error locations when a :exc:`SyntaxError` is raised
in the basic REPL. Patch by Sergey B Kirpichev.

31
Python/pythonrun.c
View File

@ -280,11 +280,42 @@ PyRun_InteractiveOneObjectEx(FILE *fp, PyObject *filename,
PyObject *main_dict = PyModule_GetDict(main_module); // borrowed ref
PyObject *res = run_mod(mod, filename, main_dict, main_dict, flags, arena, interactive_src, 1);
Py_INCREF(interactive_src);
_PyArena_Free(arena);
Py_DECREF(main_module);
if (res == NULL) {
PyThreadState *tstate = _PyThreadState_GET();
PyObject *exc = _PyErr_GetRaisedException(tstate);
if (PyType_IsSubtype(Py_TYPE(exc),
(PyTypeObject *) PyExc_SyntaxError))
{
/* fix "text" attribute */
assert(interactive_src != NULL);
PyObject *xs = PyUnicode_Splitlines(interactive_src, 1);
if (xs == NULL) {
goto error;
}
PyObject *exc_lineno = PyObject_GetAttr(exc, &_Py_ID(lineno));
if (exc_lineno == NULL) {
Py_DECREF(xs);
goto error;
}
int n = PyLong_AsInt(exc_lineno);
Py_DECREF(exc_lineno);
if (n <= 0 || n > PyList_GET_SIZE(xs)) {
Py_DECREF(xs);
goto error;
}
PyObject *line = PyList_GET_ITEM(xs, n - 1);
PyObject_SetAttr(exc, &_Py_ID(text), line);
Py_DECREF(xs);
}
error:
Py_DECREF(interactive_src);
_PyErr_SetRaisedException(tstate, exc);
return -1;
}
Py_DECREF(interactive_src);
Py_DECREF(res);
flush_io();