mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-35459: Use PyDict_GetItemWithError() instead of PyDict_GetItem(). (GH-11112)

Browse source
This commit is contained in:
Serhiy Storchaka 2019-02-25 17:59:46 +02:00 • committed by GitHub
parent a180b007d9
commit a24107b04c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 538 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Python/ceval.c
View file

@ -2090,10 +2090,12 @@ main_loop:
PyObject *bc;
if (PyDict_CheckExact(f->f_builtins)) {
bc = _PyDict_GetItemId(f->f_builtins, &PyId___build_class__);
bc = _PyDict_GetItemIdWithError(f->f_builtins, &PyId___build_class__);
if (bc == NULL) {
PyErr_SetString(PyExc_NameError,
"__build_class__ not found");
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_NameError,
"__build_class__ not found");
}
goto error;
}
Py_INCREF(bc);
@ -2241,8 +2243,10 @@ main_loop:
int err;
err = PyDict_DelItem(f->f_globals, name);
if (err != 0) {
format_exc_check_arg(
PyExc_NameError, NAME_ERROR_MSG, name);
if (PyErr_ExceptionMatches(PyExc_KeyError)) {
format_exc_check_arg(
PyExc_NameError, NAME_ERROR_MSG, name);
}
goto error;
}
DISPATCH();
@ -2258,8 +2262,13 @@ main_loop:
goto error;
}
if (PyDict_CheckExact(locals)) {
v = PyDict_GetItem(locals, name);
Py_XINCREF(v);
v = PyDict_GetItemWithError(locals, name);
if (v != NULL) {
Py_INCREF(v);
}
else if (PyErr_Occurred()) {
goto error;
}
}
else {
v = PyObject_GetItem(locals, name);
@ -2270,15 +2279,22 @@ main_loop:
}
}
if (v == NULL) {
v = PyDict_GetItem(f->f_globals, name);
Py_XINCREF(v);
if (v == NULL) {
v = PyDict_GetItemWithError(f->f_globals, name);
if (v != NULL) {
Py_INCREF(v);
}
else if (PyErr_Occurred()) {
goto error;
}
else {
if (PyDict_CheckExact(f->f_builtins)) {
v = PyDict_GetItem(f->f_builtins, name);
v = PyDict_GetItemWithError(f->f_builtins, name);
if (v == NULL) {
format_exc_check_arg(
if (!PyErr_Occurred()) {
format_exc_check_arg(
PyExc_NameError,
NAME_ERROR_MSG, name);
}
goto error;
}
Py_INCREF(v);
@ -2386,8 +2402,13 @@ main_loop:
assert(idx >= 0 && idx < PyTuple_GET_SIZE(co->co_freevars));
name = PyTuple_GET_ITEM(co->co_freevars, idx);
if (PyDict_CheckExact(locals)) {
value = PyDict_GetItem(locals, name);
Py_XINCREF(value);
value = PyDict_GetItemWithError(locals, name);
if (value != NULL) {
Py_INCREF(value);
}
else if (PyErr_Occurred()) {
goto error;
}
}
else {
value = PyObject_GetItem(locals, name);
@ -2591,9 +2612,12 @@ main_loop:
}
/* check if __annotations__ in locals()... */
if (PyDict_CheckExact(f->f_locals)) {
ann_dict = _PyDict_GetItemId(f->f_locals,
ann_dict = _PyDict_GetItemIdWithError(f->f_locals,
&PyId___annotations__);
if (ann_dict == NULL) {
if (PyErr_Occurred()) {
goto error;
}
/* ...if not, create a new one */
ann_dict = PyDict_New();
if (ann_dict == NULL) {
@ -3921,12 +3945,15 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals,
continue;
name = PyTuple_GET_ITEM(co->co_varnames, i);
if (kwdefs != NULL) {
PyObject *def = PyDict_GetItem(kwdefs, name);
PyObject *def = PyDict_GetItemWithError(kwdefs, name);
if (def) {
Py_INCREF(def);
SETLOCAL(i, def);
continue;
}
else if (PyErr_Occurred()) {
goto fail;
}
}
missing++;
}
@ -4861,9 +4888,11 @@ import_name(PyFrameObject *f, PyObject *name, PyObject *fromlist, PyObject *leve
PyObject *import_func, *res;
PyObject* stack[5];
import_func = _PyDict_GetItemId(f->f_builtins, &PyId___import__);
import_func = _PyDict_GetItemIdWithError(f->f_builtins, &PyId___import__);
if (import_func == NULL) {
PyErr_SetString(PyExc_ImportError, "__import__ not found");
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_ImportError, "__import__ not found");
}
return NULL;
}
@ -5207,10 +5236,13 @@ unicode_concatenate(PyObject *v, PyObject *w,
PyObject *names = f->f_code->co_names;
PyObject *name = GETITEM(names, oparg);
PyObject *locals = f->f_locals;
if (locals && PyDict_CheckExact(locals) &&
PyDict_GetItem(locals, name) == v) {
if (PyDict_DelItem(locals, name) != 0) {
PyErr_Clear();
if (locals && PyDict_CheckExact(locals)) {
PyObject *w = PyDict_GetItemWithError(locals, name);
if ((w == v && PyDict_DelItem(locals, name) != 0) ||
(w == NULL && PyErr_Occurred()))
{
Py_DECREF(v);
return NULL;
}
}
break;