diff options
| author | Larry Hastings <larry@hastings.org> | 2015-09-07 12:16:38 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-09-07 12:16:38 (GMT) |
| commit | c8c47f55e636ed86791160944ccbb1ea651476bd (patch) | |
| tree | db97b6edb082a98c6ad2abcbacb6151ee2df2049 /Modules/_collectionsmodule.c | |
| parent | 71f9633818b3a0cbd36b0f6ed164d436b1997fe9 (diff) | |
| parent | 8c85a2083fdc6188d32f1eb287151cdb7e79a54a (diff) | |
| download | cpython-c8c47f55e636ed86791160944ccbb1ea651476bd.zip cpython-c8c47f55e636ed86791160944ccbb1ea651476bd.tar.gz cpython-c8c47f55e636ed86791160944ccbb1ea651476bd.tar.bz2 | |
Merge heads.
Diffstat (limited to 'Modules/_collectionsmodule.c')
| -rw-r--r-- | Modules/_collectionsmodule.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 3856d83..f450f25 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -419,9 +419,11 @@ deque_extend(dequeobject *deque, PyObject *iterable) deque->rightblock->data[deque->rightindex] = item; deque_trim_left(deque); } - Py_DECREF(it); - if (PyErr_Occurred()) + if (PyErr_Occurred()) { + Py_DECREF(it); return NULL; + } + Py_DECREF(it); Py_RETURN_NONE; } @@ -480,9 +482,11 @@ deque_extendleft(dequeobject *deque, PyObject *iterable) deque->leftblock->data[deque->leftindex] = item; deque_trim_right(deque); } - Py_DECREF(it); - if (PyErr_Occurred()) + if (PyErr_Occurred()) { + Py_DECREF(it); return NULL; + } + Py_DECREF(it); Py_RETURN_NONE; } @@ -497,8 +501,8 @@ deque_inplace_concat(dequeobject *deque, PyObject *other) result = deque_extend(deque, other); if (result == NULL) return result; - Py_DECREF(result); Py_INCREF(deque); + Py_DECREF(result); return (PyObject *)deque; } @@ -1260,8 +1264,8 @@ deque_repr(PyObject *deque) aslist, ((dequeobject *)deque)->maxlen); else result = PyUnicode_FromFormat("deque(%R)", aslist); - Py_DECREF(aslist); Py_ReprLeave(deque); + Py_DECREF(aslist); return result; } |
