Skip to content

gh-91924: Fix __lltrace__ for non-UTF-8 stdout encoding #93199

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 2 commits into from
May 25, 2022
Merged

gh-91924: Fix __lltrace__ for non-UTF-8 stdout encoding #93199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
661788c
gh-91924: Fix __lltrace__ for non-UTF-8 stdout encoding
vstinner May 25, 2022
fefaf6f
Address Dennis's review
vstinner May 25, 2022
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-05-25-04-07-22.gh-issue-91924.-UyO4q.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix ``__lltrace__`` debug feature if the stdout encoding is not UTF-8. Patch
by Victor Stinner.
4 changes: 3 additions & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ static PyObject * do_call_core(
PyObject *callargs, PyObject *kwdict, int use_tracing);

#ifdef LLTRACE
static int lltrace;
static void
dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
{
Expand Down Expand Up @@ -1715,6 +1714,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
uint8_t opcode; /* Current opcode */
int oparg; /* Current opcode argument, if any */
_Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
#ifdef LLTRACE
int lltrace = 0;
#endif

_PyCFrame cframe;
CallShape call_shape;
Expand Down