Skip to content
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.

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

bpo-32381: Rewrite PyErr_ProgramText() #23700

Merged
merged 2 commits into from Dec 8, 2020
Merged

bpo-32381: Rewrite PyErr_ProgramText() #23700

merged 2 commits into from Dec 8, 2020

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Dec 8, 2020

PyErr_ProgramText() now calls PyErr_ProgramTextObject().

https://bugs.python.org/issue32381

PyErr_ProgramText() now calls PyErr_ProgramTextObject().

PyObject *filename_obj = PyUnicode_DecodeFSDefault(filename);
if (filename_obj == NULL) {
return NULL;
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure that the contract of this function allows raising an exception? It seems that PyErr_ProgramTextObject takes care to clear the exception, as does err_programtext.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know. In case of doubt, I added a PyErr_Clear() call.

My first intent was to deprecate the function. IMO it was exposed by mistake in the stable ABI. But since PyErr_ProgramTextObject() is still needed, I prefer to rewrite PyErr_ProgramText() with PyErr_ProgramTextObject().

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks. Better safe than sorry :)

@vstinner vstinner merged commit 815506d into python:master Dec 8, 2020
@vstinner vstinner deleted the pyerr_programtext branch December 8, 2020 22:51
@vstinner
Copy link
Member Author

vstinner commented Dec 8, 2020

Thanks for the review @izbyshev.

adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
PyErr_ProgramText() now calls PyErr_ProgramTextObject().
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants