8000 gh-110805: Allow the repl to show source code and complete tracebacks by pablogsal · Pull Request #110775 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-110805: Allow the repl to show source code and complete tracebacks #110775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 13, 2023
Merged

gh-110805: Allow the repl to show source code and complete tracebacks #110775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05f9437
Allow the repl to show source code and complete tracebacks
pablogsal Oct 12, 2023
efdfaa4
fixup! Allow the repl to show source code and complete tracebacks
pablogsal Oct 13, 2023
757f3c0
fixup! fixup! Allow the repl to show source code and complete tracebacks
pablogsal Oct 13, 2023
1711384
fixup! fixup! fixup! Allow the repl to show source code and complete …
pablogsal Oct 13, 2023
64e1c41
fixup! fixup! fixup! fixup! Allow the repl to show source code and co…
pablogsal Oct 13, 2023
2da72a3
fixup! fixup! fixup! fixup! fixup! Allow the repl to show source code…
pablogsal Oct 13, 2023
de39d7d
fixup! fixup! fixup! fixup! fixup! fixup! Allow the repl to show sour…
pablogsal Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! Allow the repl to show source code and complete tracebacks
  • Loading branch information
@pablogsal
pablogsal committed Oct 13, 2023
commit efdfaa4100567a848c2fd0351c50cf45e5a4bca6
3 changes: 0 additions & 3 deletions Lib/linecache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import sys
import os
import tokenize
import types

__all__ = ["getline", "clearcache", "checkcache", "lazycache"]

Expand Down Expand Up @@ -43,8 +42,6 @@ def getlines(filename, module_globals=None):
if len(entry) != 1:
return cache[filename][2]

if isinstance(filename, types.CodeType):
return []
try:
return updatecache(filename, module_globals)
except MemoryError:
Expand Down
55 changes: 45 additions & 10 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* Forward */
static void flush_io(void);
static PyObject *run_mod(mod_ty, PyObject *, PyObject *, PyObject *,
PyCompilerFlags *, PyArena *);
PyCompilerFlags *, PyArena *, PyObject*);
static PyObject *run_pyc_file(FILE *, PyObject *, PyObject *,
PyCompilerFlags *);
static int PyRun_InteractiveOneObjectEx(FILE *, PyObject *, PyCompilerFlags *);
Expand Down Expand Up @@ -178,7 +178,8 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flag
// Call _PyParser_ASTFromFile() with sys.stdin.encoding, sys.ps1 and sys.ps2
static int
pyrun_one_parse_ast(FILE *fp, PyObject *filename,
PyCompilerFlags *flags, PyArena *arena, mod_ty *pmod)
PyCompilerFlags *flags, PyArena *arena,
mod_ty *pmod, PyObject** interactive_src)
{
PyThreadState *tstate = _PyThreadState_GET();

Expand Down Expand Up @@ -236,9 +237,9 @@ pyrun_one_parse_ast(FILE *fp, PyObject *filename,
}

int errcode = 0;
*pmod = _PyParser_ASTFromFile(fp, filename, encoding,
Py_single_input, ps1, ps2,
flags, &errcode, arena);
*pmod = _PyParser_InteractiveASTFromFile(fp, filename, encoding,
Py_single_input, ps1, ps2,
flags, &errcode, interactive_src, arena);
Py_XDECREF(ps1_obj);
Py_XDECREF(ps2_obj);
Py_XDECREF(encoding_obj);
Expand Down Expand Up @@ -266,7 +267,8 @@ PyRun_InteractiveOneObjectEx(FILE *fp, PyObject *filename,
}

mod_ty mod;
int parse_res = pyrun_one_parse_ast(fp, filename, flags, arena, &mod);
PyObject *interactive_src;
int parse_res = pyrun_one_parse_ast(fp, filename, flags, arena, &mod, &interactive_src);
if (parse_res != 0) {
_PyArena_Free(arena);
return parse_res;
Expand All @@ -279,7 +281,7 @@ 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);
PyObject *res = run_mod(mod, filename, main_dict, main_dict, flags, arena, interactive_src);
_PyArena_Free(arena);
Py_DECREF(main_module);
if (res == NULL) {
Expand Down Expand Up @@ -1149,7 +1151,7 @@ PyRun_StringFlags(const char *str, int start, PyObject *globals,
str, &_Py_STR(anon_string), start, flags, arena);

if (mod != NULL)
ret = run_mod(mod, &_Py_STR(anon_string), globals, locals, flags, arena);
ret = run_mod(mod, &_Py_STR(anon_string), globals, locals, flags, arena, NULL);
_PyArena_Free(arena);
return ret;
}
Expand All @@ -1174,7 +1176,7 @@ pyrun_file(FILE *fp, PyObject *filename, int start, PyObject *globals,

PyObject *ret;
if (mod != NULL) {
ret = run_mod(mod, filename, globals, locals, flags, arena);
ret = run_mod(mod, filename, globals, locals, flags, arena, NULL);
}
else {
ret = NULL;
Expand Down Expand Up @@ -1262,13 +1264,46 @@ run_eval_code_obj(PyThreadState *tstate, PyCodeObject *co, PyObject *globals, Py

static PyObject *
run_mod(mod_ty mod, PyObject *filename, PyObject *globals, PyObject *locals,
PyCompilerFlags *flags, PyArena *arena)
PyCompilerFlags *flags, PyArena *arena, PyObject* interactive_src)
{
PyThreadState *tstate = _PyThreadState_GET();
PyObject* interactive_filename = NULL;
if (interactive_src) {
PyInterpreterState *interp = tstate->interp;
interactive_filename = PyUnicode_FromFormat("<python-input-%d>", interp->_interactive_src_count++);
// TODO: Maybe we are leaking
filename = interactive_filename;
}

PyCodeObject *co = _PyAST_Comp 866F ile(mod, filename, flags, -1, arena);
if (co == NULL)
return NULL;

if (interactive_src) {
PyObject *linecache_module = PyImport_ImportModule("linecache");

if (linecache_module == NULL) {
return NULL;
}

PyObject *print_tb_func = PyObject_GetAttrString(linecache_module, "_register_code");

if (print_tb_func == NULL || !PyCallable_Check(print_tb_func)) {
Py_DECREF(linecache_module);
return NULL;
}

PyObject* result = PyObject_CallFunction(print_tb_func, "OOO", interactive_filename, interactive_src, filename);
if (!result) {
Py_DECREF(linecache_module);
Py_XDECREF(print_tb_func);
return NULL;
}
Py_DECREF(linecache_module);
Py_XDECREF(print_tb_func);
Py_DECREF(result);
}

if (_PySys_Audit(tstate, "exec", "O", co) < 0) {
Py_DECREF(co);
return NULL;
Expand Down
0