mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge 3.6

Browse source
This commit is contained in:
Victor Stinner 2017-01-03 23:47:39 +01:00
commit 12bc0274a8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_datetimemodule.c
View file

@ -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)