[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/016953aabc47
changeset:   81471:016953aabc47
parent:      81469:72ddb250f058
parent:      81470:623a7de80432
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jan 12 21:22:33 2013 -0500
summary:
  merge 3.3

files:
  Modules/_collectionsmodule.c |  8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -632,7 +632,7 @@
 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 @@
     assert(deque->leftblock == deque->rightblock &&
            deque->leftindex - 1 == deque->rightindex &&
            deque->len == 0);
-    return 0;
 }
 
 static PyObject *
@@ -748,10 +747,7 @@
 static PyObject *
 deque_clearmethod(dequeobject *deque)
 {
-    int rv;
-
-    rv = deque_clear(deque);
-    assert (rv != -1);
+    deque_clear(deque);
     Py_RETURN_NONE;
 }
 

-- 
Repository URL: http://hg.python.org/cpython