diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-03 22:47:39 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-03 22:47:39 (GMT) |
| commit | 12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d (patch) | |
| tree | 74e124e052f00a2547abed36853718306236e710 /Modules | |
| parent | 0f0551210452506d7d5bb40a427ab82986f87a45 (diff) | |
| parent | 423c16b4c3454c8d8c4091ffb4538394a02c75d5 (diff) | |
| download | cpython-12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d.zip cpython-12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d.tar.gz cpython-12bc0274a8953d6b6a22b6fabc2e6bb9323bd03d.tar.bz2 | |
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 d11f4a9..205b15b 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) |