From: Raymond Hettinger <python@rcn.com>
Date: Sun, 11 Oct 2015 03:56:02 +0000 (-0400)
Subject: Minor tweak.  Make the maxlen comparisons a little more clear and consistent.
X-Git-Tag: v3.6.0a1~1268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7f63009d6df9c6ae57e6835857d6c5fda024930;p=python

Minor tweak.  Make the maxlen comparisons a little more clear and consistent.
---

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 4ea9140a88..52f40b2899 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -281,7 +281,7 @@ PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
 static void
 deque_trim_right(dequeobject *deque)
 {
-    if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) {
+    if (deque->maxlen >= 0 && Py_SIZE(deque) > deque->maxlen) {
         PyObject *rv = deque_pop(deque, NULL);
         assert(rv != NULL);
         assert(Py_SIZE(deque) <= deque->maxlen);
@@ -292,7 +292,7 @@ deque_trim_right(dequeobject *deque)
 static void
 deque_trim_left(dequeobject *deque)
 {
-    if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) {
+    if (deque->maxlen >= 0 && Py_SIZE(deque) > deque->maxlen) {
         PyObject *rv = deque_popleft(deque, NULL);
         assert(rv != NULL);
         assert(Py_SIZE(deque) <= deque->maxlen);
@@ -385,7 +385,7 @@ deque_extend(dequeobject *deque, PyObject *iterable)
 {
     PyObject *it, *item;
     PyObject *(*iternext)(PyObject *);
-    int trim = (deque->maxlen != -1);
+    int trim = (deque->maxlen >= 0);
 
     /* Handle case where id(deque) == id(iterable) */
     if ((PyObject *)deque == iterable) {
@@ -447,7 +447,7 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
 {
     PyObject *it, *item;
     PyObject *(*iternext)(PyObject *);
-    int trim = (deque->maxlen != -1);
+    int trim = (deque->maxlen >= 0);
 
     /* Handle case where id(deque) == id(iterable) */
     if ((PyObject *)deque == iterable) {
@@ -686,7 +686,7 @@ deque_inplace_repeat(dequeobject *deque, Py_ssize_t n)
         /* common case, repeating a single element */
         PyObject *item = deque->leftblock->data[deque->leftindex];
 
-        if (deque->maxlen != -1 && n > deque->maxlen)
+        if (deque->maxlen >= 0 && n > deque->maxlen)
             n = deque->maxlen;
 
         if (n > MAX_DEQUE_LEN)
@@ -1355,7 +1355,7 @@ deque_repr(PyObject *deque)
         Py_ReprLeave(deque);
         return NULL;
     }
-    if (((dequeobject *)deque)->maxlen != -1)
+    if (((dequeobject *)deque)->maxlen >= 0)
         result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)",
                                       aslist, ((dequeobject *)deque)->maxlen);
     else