Kaydet (Commit) 12bc0274 authored tarafından Victor Stinner's avatar Victor Stinner

Merge 3.6

...@@ -3855,11 +3855,11 @@ time_hash(PyDateTime_Time *self) ...@@ -3855,11 +3855,11 @@ time_hash(PyDateTime_Time *self)
{ {
if (self->hashcode == -1) { if (self->hashcode == -1) {
PyObject *offset, *self0; PyObject *offset, *self0;
if (DATE_GET_FOLD(self)) { if (TIME_GET_FOLD(self)) {
self0 = new_time_ex2(DATE_GET_HOUR(self), self0 = new_time_ex2(TIME_GET_HOUR(self),
DATE_GET_MINUTE(self), TIME_GET_MINUTE(self),
DATE_GET_SECOND(self), TIME_GET_SECOND(self),
DATE_GET_MICROSECOND(self), TIME_GET_MICROSECOND(self),
HASTZINFO(self) ? self->tzinfo : Py_None, HASTZINFO(self) ? self->tzinfo : Py_None,
0, Py_TYPE(self)); 0, Py_TYPE(self));
if (self0 == NULL) if (self0 == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment