mirror of
https://github.com/python/cpython.git
synced 2025-09-28 11:15:17 +00:00
delta_setstate(): This waS no longer referenced, so nukeit.
delta_reduce(): Simplified.
This commit is contained in:
parent
96ef8115dd
commit
8a60c2238b
1 changed files with 2 additions and 38 deletions
|
@ -1947,9 +1947,7 @@ delta_str(PyDateTime_Delta *self)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Pickle support. Quite a maze! While __getstate__/__setstate__ sufficed
|
/* Pickle support. This is a plain application of __reduce__.
|
||||||
* in the Python implementation, the C implementation also requires
|
|
||||||
* __reduce__, and a __safe_for_unpickling__ attr in the type object.
|
|
||||||
*/
|
*/
|
||||||
static PyObject *
|
static PyObject *
|
||||||
delta_getstate(PyDateTime_Delta *self)
|
delta_getstate(PyDateTime_Delta *self)
|
||||||
|
@ -1959,44 +1957,10 @@ delta_getstate(PyDateTime_Delta *self)
|
||||||
GET_TD_MICROSECONDS(self));
|
GET_TD_MICROSECONDS(self));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* __setstate__ isn't exposed. */
|
|
||||||
static PyObject *
|
|
||||||
delta_setstate(PyDateTime_Delta *self, PyObject *state)
|
|
||||||
{
|
|
||||||
int day;
|
|
||||||
int second;
|
|
||||||
int us;
|
|
||||||
|
|
||||||
if (!PyArg_ParseTuple(state, "iii:__setstate__", &day, &second, &us))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
self->hashcode = -1;
|
|
||||||
SET_TD_DAYS(self, day);
|
|
||||||
SET_TD_SECONDS(self, second);
|
|
||||||
SET_TD_MICROSECONDS(self, us);
|
|
||||||
|
|
||||||
Py_INCREF(Py_None);
|
|
||||||
return Py_None;
|
|
||||||
}
|
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
delta_reduce(PyDateTime_Delta* self)
|
delta_reduce(PyDateTime_Delta* self)
|
||||||
{
|
{
|
||||||
PyObject* result = NULL;
|
return Py_BuildValue("ON", self->ob_type, delta_getstate(self));
|
||||||
PyObject* state = delta_getstate(self);
|
|
||||||
|
|
||||||
if (state != NULL) {
|
|
||||||
/* The funky "()" in the format string creates an empty
|
|
||||||
* tuple as the 2nd component of the result 3-tuple.
|
|
||||||
*/
|
|
||||||
result = Py_BuildValue("O(iii)",
|
|
||||||
self->ob_type,
|
|
||||||
self->days,
|
|
||||||
self->seconds,
|
|
||||||
self->microseconds);
|
|
||||||
Py_DECREF(state);
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define OFFSET(field) offsetof(PyDateTime_Delta, field)
|
#define OFFSET(field) offsetof(PyDateTime_Delta, field)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue