Skip to content

C
cpython
Kaydet (Commit) a154b5ce authored tarafından Victor Stinner's avatar Victor Stinner
Dosyalara gözat
Seçenekler

Simplify _count_elements() in _collections 

PyIter_Next() cannot return a PyExc_StopIteration: it clears this exception.
üst 52d8fb5c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
Modules/_collectionsmodule.c
Dosyayı görüntüle @ a154b5ce
...@@ -1552,12 +1552,8 @@ _count_elements(PyObject *self, PyObject *args) ...@@ -1552,12 +1552,8 @@ _count_elements(PyObject *self, PyObject *args)
if (PyDict_CheckExact(mapping)) { if (PyDict_CheckExact(mapping)) {
while (1) { while (1) {
key = PyIter_Next(it); key = PyIter_Next(it);
if (key == NULL) { if (key == NULL)
if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_StopIteration)) break;
PyErr_Clear();
else
break;
}
oldval = PyDict_GetItem(mapping, key); oldval = PyDict_GetItem(mapping, key);
if (oldval == NULL) { if (oldval == NULL) {
if (PyDict_SetItem(mapping, key, one) == -1) if (PyDict_SetItem(mapping, key, one) == -1)
...@@ -1575,12 +1571,8 @@ _count_elements(PyObject *self, PyObject *args) ...@@ -1575,12 +1571,8 @@ _count_elements(PyObject *self, PyObject *args)
} else { } else {
while (1) { while (1) {
key = PyIter_Next(it); key = PyIter_Next(it);
if (key == NULL) { if (key == NULL)
if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_StopIteration)) break;
PyErr_Clear();
else
break;
}
oldval = PyObject_GetItem(mapping, key); oldval = PyObject_GetItem(mapping, key);
if (oldval == NULL) { if (oldval == NULL) {
if (!PyErr_Occurred() || !PyErr_ExceptionMatches(PyExc_KeyError)) if (!PyErr_Occurred() || !PyErr_ExceptionMatches(PyExc_KeyError))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment