1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework delta_divmod to avoid use of PyTuple_SetItem.

Browse Source
This commit is contained in:
Mark Dickinson 2010-04-20 23:24:25 +00:00
parent 56a6087826
commit a03e53482c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/datetimemodule.c
View File

@ -1927,7 +1927,8 @@ delta_divmod(PyObject *left, PyObject *right)
PyObject *pyus_left; PyObject *pyus_left;
PyObject *pyus_right; PyObject *pyus_right;
PyObject *divmod; PyObject *divmod;
PyObject *microseconds, *delta; PyObject *delta;
PyObject *result;
if (!PyDelta_Check(left) || !PyDelta_Check(right)) { if (!PyDelta_Check(left) || !PyDelta_Check(right)) {
Py_INCREF(Py_NotImplemented); Py_INCREF(Py_NotImplemented);
@ -1950,14 +1951,16 @@ delta_divmod(PyObject *left, PyObject *right)
if (divmod == NULL) if (divmod == NULL)
return NULL; return NULL;
microseconds = PyTuple_GetItem(divmod, 1); assert(PyTuple_Size(divmod) == 2);
delta = microseconds_to_delta(microseconds); delta = microseconds_to_delta(PyTuple_GET_ITEM(divmod, 1));
if (delta == NULL) { if (delta == NULL) {
Py_DECREF(divmod); Py_DECREF(divmod);
return NULL; return NULL;
} }
PyTuple_SetItem(divmod, 1, delta); result = PyTuple_Pack(2, PyTuple_GET_ITEM(divmod, 0), delta);
return divmod; Py_DECREF(delta);
Py_DECREF(divmod);
return result;
} }
/* Fold in the value of the tag ("seconds", "weeks", etc) component of a /* Fold in the value of the tag ("seconds", "weeks", etc) component of a