GH-101578: Normalize the current exception #101607
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
markshannon
requested review from
pablogsal,
lysnikolaou,
brettcannon,
encukou,
ericsnowcurrently,
ncoghlan,
warsaw,
iritkatriel and
methane
as code owners
iritkatriel
reviewed
Feb 6, 2023
Doc/c-api/exceptions.rst
Outdated
|
|
||
| .. c:function:: void PyErr_Restore1(PyObject *exc) | ||
|
|
||
| As of 3.12, this function is deprecated. Use :c:func:`PyErr_Restore1` instead. |
Doc/c-api/exceptions.rst
Outdated
|
|
||
| As of 3.12, this function is deprecated. Use :c:func:`PyErr_Restore1` instead. | ||
|
|
||
| Set the error indicator to ``exc``. |
There was a problem hiding this comment.
This looks like it's in the wrong place.
iritkatriel
reviewed
Feb 7, 2023
| PyAPI_FUNC(int) _PyErr_ExceptionMatches( | ||
| PyThreadState *tstate, | ||
| PyObject *exc); | ||
|
|
||
| void | ||
| _PyErr_SetRaisedException(PyThreadState *tstate, PyObject *exc); |
There was a problem hiding this comment.
does this need "extern" too?
| PyObject *old_exc = tstate->current_exception; | ||
| tstate->current_exception = exc; | ||
| Py_XDECREF(old_exc); | ||
| } | ||
|
|
||
| void | ||
| _PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value, | ||
| PyObject *traceback) | ||
| { |
There was a problem hiding this comment.
I don't think it's currently a requirement to pass in only normalised exceptions. This could break C extensions.
There was a problem hiding this comment.
I'll add some extra logic. It will slow things down a bit, but safety first.
There was a problem hiding this comment.
Maybe you could make _PyErr_Restore to expectonly normalised exceptions, but normalise them in PyErr_Restore?
iritkatriel
approved these changes
Feb 7, 2023
markshannon
added
the
🔨 test-with-buildbots
|
🤖 New build scheduled with the buildbot fleet by @markshannon for commit 566f6e1 🤖 If you want to schedule another build, you need to add the |
bedevere-bot
removed
the
🔨 test-with-buildbots
markshannon
added
the
🔨 test-with-buildbots
|
🤖 New build scheduled with the buildbot fleet by @markshannon for commit 99f0880 🤖 If you want to schedule another build, you need to add the |
bedevere-bot
removed
the
🔨 test-with-buildbots
|
The |
carljm
added a commit
to carljm/cpython
that referenced
this pull request
Feb 9, 2023
* main: (82 commits) pythongh-101670: typo fix in PyImport_ExtendInittab() (python#101723) pythonGH-99293: Document that `Py_TPFLAGS_VALID_VERSION_TAG` shouldn't be used. (#pythonGH-101736) no-issue: Add Dong-hee Na as the cjkcodecs codeowner (pythongh-101731) pythongh-101678: Merge math_1_to_whatever() and math_1() (python#101730) pythongh-101678: refactor the math module to use special functions from c11 (pythonGH-101679) pythongh-85984: Remove legacy Lib/pty.py code. (python#92365) pythongh-98831: Use opcode metadata for stack_effect() (python#101704) pythongh-101283: Version was just released, so should be changed in 3.11.3 (pythonGH-101719) pythongh-101283: Fix use of unbound variable (pythonGH-101712) pythongh-101283: Improved fallback logic for subprocess with shell=True on Windows (pythonGH-101286) pythongh-101277: Port more itertools static types to heap types (python#101304) pythongh-98831: Modernize CALL and family (python#101508) pythonGH-101696: invalidate type version tag in `_PyStaticType_Dealloc` (python#101697) pythongh-100221: Fix creating dirs in `make sharedinstall` (pythonGH-100329) pythongh-101670: typo fix in PyImport_AppendInittab() (pythonGH-101672) pythongh-101196: Make isdir/isfile/exists faster on Windows (pythonGH-101324) pythongh-101614: Don't treat python3_d.dll as a Python DLL when checking extension modules for incompatibility (pythonGH-101615) pythongh-100933: Improve `check_element` helper in `test_xml_etree` (python#100934) pythonGH-101578: Normalize the current exception (pythonGH-101607) pythongh-47937: Note that Popen attributes are read-only (python#93070) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a necessary step for implementing PEP 669, as instrumentation needs exceptions to be normalized.
Also fixes #101578.
PyErr_SetObject()behavior is strange and not as documented. #101578