From: Victor Stinner Date: Wed, 2 Sep 2015 08:10:26 +0000 (+0200) Subject: Backed out changeset b690bf218702 X-Git-Tag: v3.6.0a1~1712 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a53ec7a91abb7cdbb1a13862f39d3183cab7f2a4;p=python Backed out changeset b690bf218702 Issue #23517: the change broke test_datetime. datetime.timedelta() rounding mode must also be changed, and test_datetime must be updated for the new rounding mode (half up). --- diff --git a/Misc/NEWS b/Misc/NEWS index 8226f20f27..38f31e4880 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -17,11 +17,6 @@ Core and Builtins Library ------- -- 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. - - Issue #23552: Timeit now warns when there is substantial (4x) variance between best and worst times. Patch from Serhiy Storchaka. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index e1cd2b57a1..5cff3f8ffc 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_HALF_UP) == -1) + &timet, &us, _PyTime_ROUND_FLOOR) == -1) return NULL; return datetime_from_timet_and_us(cls, f, timet, (int)us, tzinfo);