summaryrefslogtreecommitdiffstats
path: root/Modules/_collectionsmodule.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-13 02:22:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-01-13 02:22:33 (GMT)
commitfa3965ab767bc85375634561cf9e4acf22eba5f2 (patch)
tree9086858dd1bac9f9065dac0b9849b1bf5ebab2fc /Modules/_collectionsmodule.c
parentabdcf2c579d5efe76f6a1cc62fa4c713a55fb8ff (diff)
parent0e5c48a9171fd0182f67929b82c4b539c5356736 (diff)
downloadcpython-fa3965ab767bc85375634561cf9e4acf22eba5f2.zip
cpython-fa3965ab767bc85375634561cf9e4acf22eba5f2.tar.gz
cpython-fa3965ab767bc85375634561cf9e4acf22eba5f2.tar.bz2
merge 3.3
Diffstat (limited to 'Modules/_collectionsmodule.c')
-rw-r--r--Modules/_collectionsmodule.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 6e7f1e7..45b4f74 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -632,7 +632,7 @@ deque_remove(dequeobject *deque, PyObject *value)
PyDoc_STRVAR(remove_doc,
"D.remove(value) -- remove first occurrence of value.");
-static int
+static void
deque_clear(dequeobject *deque)
{
PyObject *item;
@@ -645,7 +645,6 @@ deque_clear(dequeobject *deque)
assert(deque->leftblock == deque->rightblock &&
deque->leftindex - 1 == deque->rightindex &&
deque->len == 0);
- return 0;
}
static PyObject *
@@ -748,10 +747,7 @@ deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v)
static PyObject *
deque_clearmethod(dequeobject *deque)
{
- int rv;
-
- rv = deque_clear(deque);
- assert (rv != -1);
+ deque_clear(deque);
Py_RETURN_NONE;
}