summaryrefslogtreecommitdiff
path: root/Modules/_datetimemodule.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-02 01:57:23 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-09-02 01:57:23 +0200
commit265e1259e4ad7001ea366d52c56adde8daed7a69 (patch)
tree9cc370130de5b4d50588d33d8a8174e560d162da /Modules/_datetimemodule.c
parent744742320f259776dab1c8ef86e22225ef569d17 (diff)
downloadcpython-git-265e1259e4ad7001ea366d52c56adde8daed7a69.tar.gz
Issue #23517: datetime.datetime.fromtimestamp() and
datetime.datetime.utcfromtimestamp() now rounds to nearest with ties going away from zero, instead of rounding towards minus infinity (-inf), as Python 2 and Python older than 3.3.
Diffstat (limited to 'Modules/_datetimemodule.c')
-rw-r--r--Modules/_datetimemodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 5cff3f8ffc..e1cd2b57a1 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -4098,7 +4098,7 @@ datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp,
long us;
if (_PyTime_ObjectToTimeval(timestamp,
- &timet, &us, _PyTime_ROUND_FLOOR) == -1)
+ &timet, &us, _PyTime_ROUND_HALF_UP) == -1)
return NULL;
return datetime_from_timet_and_us(cls, f, timet, (int)us, tzinfo);