bpo-33509: Fix _warnings for module_globals=None #6833
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
Don't crash on warnings.warn_explicit() if module_globals is None.
1st1
approved these changes
May 14, 2018
Python/_warnings.c
Outdated
| @@ -883,6 +883,13 @@ get_source_line(PyObject *module_globals, int lineno) | |||
| PyObject *source_list; | |||
| PyObject *source_line; | |||
|
|
|||
| if (!PyDict_Check(module_globals)) { | |||
There was a problem hiding this comment.
I would move this check into warnings_warn_explicit().
Python/_warnings.c
Outdated
| @@ -883,6 +883,13 @@ get_source_line(PyObject *module_globals, int lineno) | |||
| PyObject *source_list; | |||
| PyObject *source_line; | |||
|
|
|||
| if (!PyDict_Check(module_globals)) { | |||
| PyErr_Format(PyExc_TypeError, | |||
| "module_globals must be a dict, " "not '%.200s'", | |||
|
Sorry, I don't see you latest changes Victor. |
Woops. I just forgot to commit my changes... They are now published. |
serhiy-storchaka
approved these changes
May 15, 2018
|
@vstinner: Please replace |
|
Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 15, 2018
Don't crash on warnings.warn_explicit() if module_globals is not a dict. (cherry picked from commit b056562) Co-authored-by: Victor Stinner <vstinner@redhat.com>
|
GH-6870 is a backport of this pull request to the 3.7 branch. |
miss-islington
added a commit
that referenced
this pull request
May 15, 2018
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.
Don't crash on warnings.warn_explicit() if module_globals is None.
https://bugs.python.org/issue33509