diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-03 23:47:39 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-03 23:47:39 +0100 |
| commit | 8b931494e11cf0f6e07a2a5cbb1147afab5f0422 (patch) | |
| tree | 60d07d80f22e416dc7eafcd903e62efe357bfcdf /Modules | |
| parent | a2a9ff438da87a6d5ea8de312590aa6a4fb9f242 (diff) | |
| parent | 3fa413fa53e44d89d4876a8238ba28d0a224cd98 (diff) | |
| download | cpython-8b931494e11cf0f6e07a2a5cbb1147afab5f0422.tar.gz | |
Merge 3.6
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_datetimemodule.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index d11f4a9a6b..205b15bb18 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -3855,11 +3855,11 @@ time_hash(PyDateTime_Time *self) { if (self->hashcode == -1) { PyObject *offset, *self0; - if (DATE_GET_FOLD(self)) { - self0 = new_time_ex2(DATE_GET_HOUR(self), - DATE_GET_MINUTE(self), - DATE_GET_SECOND(self), - DATE_GET_MICROSECOND(self), + if (TIME_GET_FOLD(self)) { + self0 = new_time_ex2(TIME_GET_HOUR(self), + TIME_GET_MINUTE(self), + TIME_GET_SECOND(self), + TIME_GET_MICROSECOND(self), HASTZINFO(self) ? self->tzinfo : Py_None, 0, Py_TYPE(self)); if (self0 == NULL) |