bpo-31411: Prevent raising a SystemError in case warnings.onceregistry is not a dictionary #3485
Conversation
This file contains hidden or 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
Python/_warnings.c
Outdated
| @@ -514,6 +514,11 @@ warn_explicit(PyObject *category, PyObject *message, | |||
| registry = get_once_registry(); | |||
| if (registry == NULL) | |||
| goto cleanup; | |||
| if (!PyDict_Check(registry)) { | |||
There was a problem hiding this comment.
I would add this check in get_once_registry().
serhiy-storchaka
approved these changes
Sep 11, 2017
serhiy-storchaka
added
needs backport to 2.7
type-bug
|
Thank you for your PR @orenmn. Do you mind to add a NEWS.d entry? |
|
Thanks @orenmn for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6. |
|
Sorry, @orenmn and @serhiy-storchaka, I could not cleanly backport this to |
serhiy-storchaka
pushed a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Sep 11, 2017
…egistry is not a dictionary. (pythonGH-3485). (cherry picked from commit 252033d)
|
GH-3493 is a backport of this pull request to the 2.7 branch. |
serhiy-storchaka
pushed a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Sep 11, 2017
…egistry is not a dictionary. (pythonGH-3485). (cherry picked from commit 252033d)
|
GH-3494 is a backport of this pull request to the 3.6 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Sep 11, 2017
serhiy-storchaka
added a commit
that referenced
this pull request
Sep 11, 2017
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.
_warnings.c: add a check whether warnings.onceregistry is not a dictionary. while we are here, fix a related inaccurate error message.test_warnings/__init__.py: add a test to verify that the SystemError is no more.https://bugs.python.org/issue31411