Skip to content

Commit 1f9cba2

Browse files
committed
Replace datetimemodule PyTuple_Pack uses with PyTuple_FromArray
1 parent 957f9fe commit 1f9cba2

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

Modules/_datetimemodule.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,7 @@ delta_divmod(PyObject *left, PyObject *right)
26922692
Py_DECREF(divmod);
26932693
return NULL;
26942694
}
2695-
result = PyTuple_Pack(2, PyTuple_GET_ITEM(divmod, 0), delta);
2695+
result = PyTuple_FromArray((PyObject*[]){ PyTuple_GET_ITEM(divmod, 0), delta }, 2);
26962696
Py_DECREF(delta);
26972697
Py_DECREF(divmod);
26982698
return result;
@@ -4478,8 +4478,8 @@ timezone_getinitargs(PyObject *op, PyObject *Py_UNUSED(dummy))
44784478
{
44794479
PyDateTime_TimeZone *self = PyTimeZone_CAST(op);
44804480
if (self->name == NULL)
4481-
return PyTuple_Pack(1, self->offset);
4482-
return PyTuple_Pack(2, self->offset, self->name);
4481+
return PyTuple_FromArray((PyObject*[]){ self->offset }, 1);
4482+
return PyTuple_FromArray((PyObject*[]){ self->offset, self->name }, 2);
44834483
}
44844484

44854485
static PyMethodDef timezone_methods[] = {
@@ -5228,9 +5228,9 @@ time_getstate(PyDateTime_Time *self, int proto)
52285228
/* Set the first bit of the first byte */
52295229
PyBytes_AS_STRING(basestate)[0] |= (1 << 7);
52305230
if (! HASTZINFO(self) || self->tzinfo == Py_None)
5231-
result = PyTuple_Pack(1, basestate);
5231+
result = PyTuple_FromArray((PyObject*[]){ basestate }, 1);
52325232
else
5233-
result = PyTuple_Pack(2, basestate, self->tzinfo);
5233+
result = PyTuple_FromArray((PyObject*[]){ basestate, self->tzinfo }, 2);
52345234
Py_DECREF(basestate);
52355235
}
52365236
return result;
@@ -7150,9 +7150,9 @@ datetime_getstate(PyDateTime_DateTime *self, int proto)
71507150
/* Set the first bit of the third byte */
71517151
PyBytes_AS_STRING(basestate)[2] |= (1 << 7);
71527152
if (! HASTZINFO(self) || self->tzinfo == Py_None)
7153-
result = PyTuple_Pack(1, basestate);
7153+
result = PyTuple_FromArray((PyObject*[]){ basestate }, 1);
71547154
else
7155-
result = PyTuple_Pack(2, basestate, self->tzinfo);
7155+
result = PyTuple_FromArray((PyObject*[]){ basestate, self->tzinfo }, 2);
71567156
Py_DECREF(basestate);
71577157
}
71587158
return result;

0 commit comments

Comments
 (0)