bpo-31416: Fix assertion failures in case of a bad warnings.filters or warnings.defaultaction #3496
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
|
|
||
| if (!PyUnicode_Check(default_action)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "warnings.defaultaction must be a string"); |
Member
There was a problem hiding this comment.
Use MODULE_NAME, as in other error messages. Include an actual type name in error message.
Python/_warnings.c
Outdated
|
|
||
| if (!PyUnicode_Check(action)) { | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "action must be a string"); |
Member
There was a problem hiding this comment.
Include an actual type name in error message.
serhiy-storchaka
approved these changes
Sep 11, 2017
serhiy-storchaka
added
needs backport to 2.7
type-bug
Contributor
|
Thanks @orenmn for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6. |
Contributor
|
Sorry, @orenmn and @serhiy-storchaka, I could not cleanly backport this to |
serhiy-storchaka
added a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Sep 12, 2017
…ters or warnings.defaultaction. (pythonGH-3496) Patch by Oren Milman.. (cherry picked from commit 9d984fd)
|
GH-3509 is a backport of this pull request to the 3.6 branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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 checks whether the action retrieved from warnings.filters is not a string, and whether warnings.defaultaction is not a string. while we are here, remove a wrong error message.test_warnings/__init__.py: add a test to verify that the assertion failures are no more.https://bugs.python.org/issue31416