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.

Sign up for GitHub

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

Jump to bottom

Fix issue bpo-31968 #4313

Closed
wants to merge 3 commits into from
Closed

Fix issue bpo-31968 #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c46309a
issue-31968: check f_globals is not exact dict in LOAD_NAME
Nov 7, 2017
11c00ec
removed empty line
Nov 7, 2017
a4ebe40
added news file
Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2017-11-07-16-25-29.bpo-31968.FfFGfY.rst
View file
Open in desktop
@@ -0,0 +1,3 @@
exec(): fixed overloaded __getitem__ method is not called for load default
argument in class method definition for dict-iherited object passed as
globals.
12 changes: 11 additions & 1 deletion Python/ceval.c
View file
Open in desktop
Expand Up @@ -2117,7 +2117,17 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
}
}
if (v == NULL) {
v = PyDict_GetItem(f->f_globals, name);
if (PyDict_CheckExact(f->f_globals)) {
v = PyDict_GetItem(f->f_globals, name);
}
else {
v = PyObject_GetItem(f->f_globals, name);
if (v == NULL && _PyErr_OCCURRED()) {
if (!PyErr_ExceptionMatches(PyExc_KeyError))
goto error;
PyErr_Clear();
}
}
Py_XINCREF(v);
if (v == NULL) {
if (PyDict_CheckExact(f->f_builtins)) {
Expand Down