Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge

This commit is contained in:
Raymond Hettinger 2015-09-05 17:06:18 -07:00
parent 5f9525b115 2b2b75374e
commit 318c5aef0e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/_collectionsmodule.c
View File

@ -419,9 +419,11 @@ deque_extend(dequeobject *deque, PyObject *iterable)
deque->rightblock->data[deque->rightindex] = item;
deque_trim_left(deque);
}
if (PyErr_Occurred()) {
Py_DECREF(it);
if (PyErr_Occurred())
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);
}
if (PyErr_Occurred()) {
Py_DECREF(it);
if (PyErr_Occurred())
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;
}