traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.3

This commit is contained in:
Benjamin Peterson 2013-01-12 21:22:33 -05:00
parent abdcf2c579 0e5c48a917
commit fa3965ab76
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_collectionsmodule.c
View File

@ -632,7 +632,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 int static void
deque_clear(dequeobject *deque) deque_clear(dequeobject *deque)
{ {
PyObject *item; PyObject *item;
@ -645,7 +645,6 @@ deque_clear(dequeobject *deque)
assert(deque->leftblock == deque->rightblock && assert(deque->leftblock == deque->rightblock &&
deque->leftindex - 1 == deque->rightindex && deque->leftindex - 1 == deque->rightindex &&
deque->len == 0); deque->len == 0);
return 0;
} }
static PyObject * static PyObject *
@ -748,10 +747,7 @@ deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v)
static PyObject * static PyObject *
deque_clearmethod(dequeobject *deque) deque_clearmethod(dequeobject *deque)
{ {
int rv; deque_clear(deque);
rv = deque_clear(deque);
assert (rv != -1);
Py_RETURN_NONE; Py_RETURN_NONE;
} }