bpo-42152: Use PyDict_Contains and PyDict_SetDefault if appropriate. (GH-22986)
If PyDict_GetItemWithError is only used to check whether the key is in dict,
it is better to use PyDict_Contains instead.
And if it is used in combination with PyDict_SetItem, PyDict_SetDefault can
replace the combination.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 0ac48b9..9be90eb 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -492,9 +492,10 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
return NULL;
/* keep this for bw compatibility */
- if (_PyDict_GetItemIdWithError(result->tp_dict, &PyId__abstract_))
+ int r = _PyDict_ContainsId(result->tp_dict, &PyId__abstract_);
+ if (r > 0)
return (PyObject *)result;
- if (PyErr_Occurred()) {
+ if (r < 0) {
Py_DECREF(result);
return NULL;
}
@@ -4397,15 +4398,13 @@ _init_pos_args(PyObject *self, PyTypeObject *type,
}
val = PyTuple_GET_ITEM(args, i + index);
if (kwds) {
- if (PyDict_GetItemWithError(kwds, name)) {
- PyErr_Format(PyExc_TypeError,
- "duplicate values for field %R",
- name);
- Py_DECREF(pair);
- Py_DECREF(name);
- return -1;
- }
- else if (PyErr_Occurred()) {
+ res = PyDict_Contains(kwds, name);
+ if (res != 0) {
+ if (res > 0) {
+ PyErr_Format(PyExc_TypeError,
+ "duplicate values for field %R",
+ name);
+ }
Py_DECREF(pair);
Py_DECREF(name);
return -1;
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 2abfa67..5cd8577 100644
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -109,8 +109,9 @@ TryAddRef(StgDictObject *dict, CDataObject *obj)
IUnknown *punk;
_Py_IDENTIFIER(_needs_com_addref_);
- if (!_PyDict_GetItemIdWithError((PyObject *)dict, &PyId__needs_com_addref_)) {
- if (PyErr_Occurred()) {
+ int r = _PyDict_ContainsId((PyObject *)dict, &PyId__needs_com_addref_);
+ if (r <= 0) {
+ if (r < 0) {
PrintError("getting _needs_com_addref_");
}
return;
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index bddd8f4..ed8afef 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2004,26 +2004,21 @@ fast_save_enter(PicklerObject *self, PyObject *obj)
self->fast_nesting = -1;
return 0;
}
- if (PyDict_GetItemWithError(self->fast_memo, key)) {
- Py_DECREF(key);
+ int r = PyDict_Contains(self->fast_memo, key);
+ if (r > 0) {
PyErr_Format(PyExc_ValueError,
"fast mode: can't pickle cyclic objects "
"including object type %.200s at %p",
Py_TYPE(obj)->tp_name, obj);
- self->fast_nesting = -1;
- return 0;
}
- if (PyErr_Occurred()) {
- Py_DECREF(key);
- self->fast_nesting = -1;
- return 0;
- }
- if (PyDict_SetItem(self->fast_memo, key, Py_None) < 0) {
- Py_DECREF(key);
- self->fast_nesting = -1;
- return 0;
+ else if (r == 0) {
+ r = PyDict_SetItem(self->fast_memo, key, Py_None);
}
Py_DECREF(key);
+ if (r != 0) {
+ self->fast_nesting = -1;
+ return 0;
+ }
}
return 1;
}
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 6ce0bcb..ccd64d6 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1526,13 +1526,11 @@ convertenviron(void)
Py_DECREF(d);
return NULL;
}
- if (PyDict_GetItemWithError(d, k) == NULL) {
- if (PyErr_Occurred() || PyDict_SetItem(d, k, v) != 0) {
- Py_DECREF(v);
- Py_DECREF(k);
- Py_DECREF(d);
- return NULL;
- }
+ if (PyDict_SetDefault(d, k, v) == NULL) {
+ Py_DECREF(v);
+ Py_DECREF(k);
+ Py_DECREF(d);
+ return NULL;
}
Py_DECREF(k);
Py_DECREF(v);
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 12ae66d..73ea513 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1614,15 +1614,7 @@ static int init_handler_descrs(void)
if (descr == NULL)
return -1;
- if (PyDict_GetItemWithError(Xmlparsetype.tp_dict, PyDescr_NAME(descr))) {
- Py_DECREF(descr);
- continue;
- }
- else if (PyErr_Occurred()) {
- Py_DECREF(descr);
- return -1;
- }
- if (PyDict_SetItem(Xmlparsetype.tp_dict, PyDescr_NAME(descr), descr) < 0) {
+ if (PyDict_SetDefault(Xmlparsetype.tp_dict, PyDescr_NAME(descr), descr) == NULL) {
Py_DECREF(descr);
return -1;
}
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index fe852f9..d02e390 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -499,11 +499,14 @@ select_poll_modify_impl(pollObject *self, int fd, unsigned short eventmask)
key = PyLong_FromLong(fd);
if (key == NULL)
return NULL;
- if (PyDict_GetItemWithError(self->dict, key) == NULL) {
- if (!PyErr_Occurred()) {
- errno = ENOENT;
- PyErr_SetFromErrno(PyExc_OSError);
- }
+ err = PyDict_Contains(self->dict, key);
+ if (err < 0) {
+ Py_DECREF(key);
+ return NULL;
+ }
+ if (err == 0) {
+ errno = ENOENT;
+ PyErr_SetFromErrno(PyExc_OSError);
Py_DECREF(key);
return NULL;
}