Restore

Author: matthiasgoergens

Modules/_collectionsmodule.c

@@ -2101,24 +2101,20 @@ dequereviter_next_lock_held(dequeiterobject *it, dequeobject *deque)
 }
 
 static PyObject *
-dequeiter_next(PyObject *op)
+dequereviter_next(PyObject *self)
 {
     PyObject *result;
-    dequeiterobject *it = dequeiterobject_CAST(op);
-    // It's safe to access it->deque without holding the per-object lock for it
-    // here; it->deque is only assigned during construction of it.
-    dequeobject *deque = it->deque;
-    Py_BEGIN_CRITICAL_SECTION2(it, deque);
-    result = dequeiter_next_lock_held(it, deque);
+    dequeiterobject *it = dequeiterobject_CAST(self);
+    Py_BEGIN_CRITICAL_SECTION2(it, it->deque);
+    result = dequereviter_next_lock_held(it, it->deque);
     Py_END_CRITICAL_SECTION2();
-
     return result;
 }
 
 static PyObject *
 dequereviter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    Py_ssize_t i, index=0;
+    Py_ssize_t i, index = 0;
     PyObject *deque;
     dequeiterobject *it;
     collections_state *state = get_module_state_by_cls(type);
@@ -2130,24 +2126,18 @@ dequereviter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (!it)
         return NULL;
     /* consume items from the queue */
-    for(i=0; i<index; i++) {
+    for (i=0; i < index; i++) {
         PyObject *item = dequereviter_next((PyObject *)it);
-        if (item) {
-            Py_DECREF(item);
-        } else {
-            /*
-             * It's safe to read directly from it without acquiring the
-             * per-object lock; the iterator isn't visible to any other threads
-             * yet.
-             */
-            if (it->counter) {
+        if (item == NULL) {
+            if (PyErr_Occurred()) {
                 Py_DECREF(it);
                 return NULL;
-            } else
-                break;
+            }
+            break;
         }
+        Py_DECREF(item);
     }
-    return (PyObject*)it;
+    return (PyObject *)it;
 }
 
 static PyType_Slot dequereviter_slots[] = {
@@ -2598,9 +2588,9 @@ _collections__count_elements_impl(PyObject *module, PyObject *mapping,
     Py_XDECREF(newval);
     Py_XDECREF(bound_get);
     if (PyErr_Occurred())
-        return NULL;
-    Py_RETURN_NONE;
-}
+                return NULL;
+            Py_RETURN_NONE;
+        }
 
 /* Helper function for namedtuple() ************************************/
 
@@ -2628,7 +2618,7 @@ tuplegetter_new_impl(PyTypeObject *type, Py_ssize_t index, PyObject *doc)
     _tuplegetterobject* self;
     self = (_tuplegetterobject *)type->tp_alloc(type, 0);
     if (self == NULL) {
-        return NULL;
+            return NULL;
     }
     self->index = index;
     self->doc = Py_NewRef(doc);
@@ -2661,8 +2651,8 @@ tuplegetter_descr_get(PyObject *self, PyObject *obj, PyObject *type)
                      "doesn't apply to '%s' object",
                      index,
                      Py_TYPE(obj)->tp_name);
-        return NULL;
-    }
+    return NULL;
+}
 
     if (!valid_index(index, PyTuple_GET_SIZE(obj))) {
         PyErr_SetString(PyExc_IndexError, "tuple index out of range");