Commit db107424 authored by Serhiy Storchaka's avatar Serhiy Storchaka Committed by GitHub

[2.7] bpo-33677: Fix the signature of tp_clear handler for deque. (GH-7196). (GH-7277)

(cherry picked from commit a5c42284)
parent 82c456fa
...@@ -639,7 +639,7 @@ deque_remove(dequeobject *deque, PyObject *value) ...@@ -639,7 +639,7 @@ deque_remove(dequeobject *deque, PyObject *value)
PyDoc_STRVAR(remove_doc, PyDoc_STRVAR(remove_doc,
"D.remove(value) -- remove first occurrence of value."); "D.remove(value) -- remove first occurrence of value.");
static void static int
deque_clear(dequeobject *deque) deque_clear(dequeobject *deque)
{ {
block *b; block *b;
...@@ -650,7 +650,7 @@ deque_clear(dequeobject *deque) ...@@ -650,7 +650,7 @@ deque_clear(dequeobject *deque)
PyObject *item; PyObject *item;
if (deque->len == 0) if (deque->len == 0)
return; return 0;
/* During the process of clearing a deque, decrefs can cause the /* During the process of clearing a deque, decrefs can cause the
deque to mutate. To avoid fatal confusion, we have to make the deque to mutate. To avoid fatal confusion, we have to make the
...@@ -701,7 +701,7 @@ deque_clear(dequeobject *deque) ...@@ -701,7 +701,7 @@ deque_clear(dequeobject *deque)
} }
assert(leftblock->rightlink == NULL); assert(leftblock->rightlink == NULL);
freeblock(leftblock); freeblock(leftblock);
return; return 0;
alternate_method: alternate_method:
while (deque->len) { while (deque->len) {
...@@ -709,6 +709,7 @@ deque_clear(dequeobject *deque) ...@@ -709,6 +709,7 @@ deque_clear(dequeobject *deque)
assert (item != NULL); assert (item != NULL);
Py_DECREF(item); Py_DECREF(item);
} }
return 0;
} }
static PyObject * static PyObject *
......
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