Skip to content

Move exc state to generator. Fixes bpo-25612 #1773

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
pitrou merged 10 commits into from
Oct 22, 2017
Merged

Move exc state to generator. Fixes bpo-25612 #1773

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
adde498
Move exception state information from frame objects to coroutine (gen…
markshannon May 23, 2017
207ff6c
Add tests to verify fix of bpo-25612 and case B6 of bpo-28884
markshannon May 23, 2017
52acc3c
Factor out clear/traverse for exc_state struct.
markshannon May 24, 2017
f2ff96e
Make sure that previous exc-state in thread is initialized properly.
markshannon May 24, 2017
963aea3
Make code conform to PEP-7
markshannon May 27, 2017
22b1e82
Change names and formatting to conform to PEP-7 and make explicit tha…
markshannon Oct 22, 2017
e5ffc67
Add blurb entry for new exception state handling.
markshannon Oct 22, 2017
d3b7efb
Right-justify C macro
pitrou Oct 22, 2017
36ea52f
More renaming and PEP-7 compliance
markshannon Oct 22, 2017
cba130e
Update implementation of 'raise' to scan exception stack.
markshannon Oct 22, 2017
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
Make sure that previous exc-state in thread is initialized properly.
  • Loading branch information
@markshannon Mark Shannon
markshannon authored and Mark Shannon committed Oct 22, 2017
commit f2ff96e35bc3e1d93a83018e4c154cf0b4f4dc16
2 changes: 1 addition & 1 deletion Python/errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback)
PyExcState *_PyErr_GetExcInfo(PyThreadState *tstate) {
PyExcState *exc_info = tstate->exc_info;
while ((exc_info->exc_type == NULL || exc_info->exc_type == Py_None) &&
exc_info->exc_previous != NULL && exc_info != &tstate->exc_state)
exc_info->exc_previous != NULL)

@1st1 1st1 May 25, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another nit, per PEP 7 we now want to use { even for blocks with one statement.

exc_info = exc_info->exc_previous;
return exc_info;
}
Expand Down
3 changes: 2 additions & 1 deletion Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ new_threadstate(PyInterpreterState *interp, int init)
tstate->exc_state.exc_type = NULL;
tstate->exc_state.exc_value = NULL;
tstate->exc_state.exc_traceback = NULL;
tstate->exc_state.exc_previous = NULL;
tstate->exc_info = &tstate->exc_state;

tstate->c_profilefunc = NULL;
Expand Down Expand Up @@ -448,7 +449,7 @@ PyThreadState_Clear(PyThreadState *tstate)
Py_CLEAR(tstate->exc_state.exc_type);
Py_CLEAR(tstate->exc_state.exc_value);
Py_CLEAR(tstate->exc_state.exc_traceback);
assert(tstate->exc_info.exc_previous == NULL);
assert(tstate->exc_info->exc_previous == NULL);

@pitrou pitrou Oct 11, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment here?

if (Py_VerboseFlag && tstate->exc_info != &tstate->exc_state)
fprintf(stderr,

@serhiy-storchaka serhiy-storchaka Oct 11, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can PyErr_WarnEx() or PySys_WriteStderr() be used here?

"PyThreadState_Clear: warning: thread still has a generator\n");
Expand Down