Revert change 0eb8c182131e:
"""Issue #23517: datetime.timedelta constructor now rounds microseconds to nearest with ties going away from zero (ROUND_HALF_UP), as Python 2 and Python older than 3.3, instead of rounding to nearest with ties going to nearest even integer (ROUND_HALF_EVEN).""" datetime.timedelta uses rounding mode ROUND_HALF_EVEN again.
This commit is contained in:
parent
1638bdfa1a
commit
69cc487df4
|
@ -407,7 +407,7 @@ class timedelta:
|
||||||
# secondsfrac isn't referenced again
|
# secondsfrac isn't referenced again
|
||||||
|
|
||||||
if isinstance(microseconds, float):
|
if isinstance(microseconds, float):
|
||||||
microseconds = _round_half_up(microseconds + usdouble)
|
microseconds = round(microseconds + usdouble)
|
||||||
seconds, microseconds = divmod(microseconds, 1000000)
|
seconds, microseconds = divmod(microseconds, 1000000)
|
||||||
days, seconds = divmod(seconds, 24*3600)
|
days, seconds = divmod(seconds, 24*3600)
|
||||||
d += days
|
d += days
|
||||||
|
@ -418,7 +418,7 @@ class timedelta:
|
||||||
days, seconds = divmod(seconds, 24*3600)
|
days, seconds = divmod(seconds, 24*3600)
|
||||||
d += days
|
d += days
|
||||||
s += seconds
|
s += seconds
|
||||||
microseconds = _round_half_up(microseconds + usdouble)
|
microseconds = round(microseconds + usdouble)
|
||||||
assert isinstance(s, int)
|
assert isinstance(s, int)
|
||||||
assert isinstance(microseconds, int)
|
assert isinstance(microseconds, int)
|
||||||
assert abs(s) <= 3 * 24 * 3600
|
assert abs(s) <= 3 * 24 * 3600
|
||||||
|
|
|
@ -663,14 +663,16 @@ class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
|
||||||
# Single-field rounding.
|
# Single-field rounding.
|
||||||
eq(td(milliseconds=0.4/1000), td(0)) # rounds to 0
|
eq(td(milliseconds=0.4/1000), td(0)) # rounds to 0
|
||||||
eq(td(milliseconds=-0.4/1000), td(0)) # rounds to 0
|
eq(td(milliseconds=-0.4/1000), td(0)) # rounds to 0
|
||||||
eq(td(milliseconds=0.5/1000), td(microseconds=1))
|
eq(td(milliseconds=0.5/1000), td(microseconds=0))
|
||||||
eq(td(milliseconds=-0.5/1000), td(microseconds=-1))
|
eq(td(milliseconds=-0.5/1000), td(microseconds=-0))
|
||||||
eq(td(milliseconds=0.6/1000), td(microseconds=1))
|
eq(td(milliseconds=0.6/1000), td(microseconds=1))
|
||||||
eq(td(milliseconds=-0.6/1000), td(microseconds=-1))
|
eq(td(milliseconds=-0.6/1000), td(microseconds=-1))
|
||||||
eq(td(seconds=0.5/10**6), td(microseconds=1))
|
eq(td(milliseconds=1.5/1000), td(microseconds=2))
|
||||||
eq(td(seconds=-0.5/10**6), td(microseconds=-1))
|
eq(td(milliseconds=-1.5/1000), td(microseconds=-2))
|
||||||
eq(td(seconds=1/2**7), td(microseconds=7813))
|
eq(td(seconds=0.5/10**6), td(microseconds=0))
|
||||||
eq(td(seconds=-1/2**7), td(microseconds=-7813))
|
eq(td(seconds=-0.5/10**6), td(microseconds=-0))
|
||||||
|
eq(td(seconds=1/2**7), td(microseconds=7812))
|
||||||
|
eq(td(seconds=-1/2**7), td(microseconds=-7812))
|
||||||
|
|
||||||
# Rounding due to contributions from more than one field.
|
# Rounding due to contributions from more than one field.
|
||||||
us_per_hour = 3600e6
|
us_per_hour = 3600e6
|
||||||
|
@ -683,6 +685,10 @@ class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
|
||||||
eq(td(hours=-.2/us_per_hour), td(0))
|
eq(td(hours=-.2/us_per_hour), td(0))
|
||||||
eq(td(days=-.4/us_per_day, hours=-.2/us_per_hour), td(microseconds=-1))
|
eq(td(days=-.4/us_per_day, hours=-.2/us_per_hour), td(microseconds=-1))
|
||||||
|
|
||||||
|
# Test for a patch in Issue 8860
|
||||||
|
eq(td(microseconds=0.5), 0.5*td(microseconds=1.0))
|
||||||
|
eq(td(microseconds=0.5)//td.resolution, 0.5*td.resolution//td.resolution)
|
||||||
|
|
||||||
def test_massive_normalization(self):
|
def test_massive_normalization(self):
|
||||||
td = timedelta(microseconds=-1)
|
td = timedelta(microseconds=-1)
|
||||||
self.assertEqual((td.days, td.seconds, td.microseconds),
|
self.assertEqual((td.days, td.seconds, td.microseconds),
|
||||||
|
|
|
@ -17,18 +17,13 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
- Issue #22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'.
|
- Issue #22241: timezone.utc name is now plain 'UTC', not 'UTC-00:00'.
|
||||||
|
|
||||||
- Issue #23517: fromtimestamp() and utcfromtimestamp() methods of
|
- Issue #23517: fromtimestamp() and utcfromtimestamp() methods of
|
||||||
datetime.datetime now round microseconds to nearest with ties going away from
|
datetime.datetime now round microseconds to nearest with ties going away from
|
||||||
zero (ROUND_HALF_UP), as Python 2 and Python older than 3.3, instead of
|
zero (ROUND_HALF_UP), as Python 2 and Python older than 3.3, instead of
|
||||||
rounding towards -Infinity (ROUND_FLOOR).
|
rounding towards -Infinity (ROUND_FLOOR).
|
||||||
|
|
||||||
- Issue #23517: datetime.timedelta constructor now rounds microseconds to
|
|
||||||
nearest with ties going away from zero (ROUND_HALF_UP), as Python 2 and
|
|
||||||
Python older than 3.3, instead of rounding to nearest with ties going to
|
|
||||||
nearest even integer (ROUND_HALF_EVEN).
|
|
||||||
|
|
||||||
- Issue #23552: Timeit now warns when there is substantial (4x) variance
|
- Issue #23552: Timeit now warns when there is substantial (4x) variance
|
||||||
between best and worst times. Patch from Serhiy Storchaka.
|
between best and worst times. Patch from Serhiy Storchaka.
|
||||||
|
|
||||||
|
|
|
@ -2149,9 +2149,29 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
||||||
if (leftover_us) {
|
if (leftover_us) {
|
||||||
/* Round to nearest whole # of us, and add into x. */
|
/* Round to nearest whole # of us, and add into x. */
|
||||||
double whole_us = round(leftover_us);
|
double whole_us = round(leftover_us);
|
||||||
|
int x_is_odd;
|
||||||
PyObject *temp;
|
PyObject *temp;
|
||||||
|
|
||||||
whole_us = _PyTime_RoundHalfUp(leftover_us);
|
whole_us = round(leftover_us);
|
||||||
|
if (fabs(whole_us - leftover_us) == 0.5) {
|
||||||
|
/* We're exactly halfway between two integers. In order
|
||||||
|
* to do round-half-to-even, we must determine whether x
|
||||||
|
* is odd. Note that x is odd when it's last bit is 1. The
|
||||||
|
* code below uses bitwise and operation to check the last
|
||||||
|
* bit. */
|
||||||
|
temp = PyNumber_And(x, one); /* temp <- x & 1 */
|
||||||
|
if (temp == NULL) {
|
||||||
|
Py_DECREF(x);
|
||||||
|
goto Done;
|
||||||
|
}
|
||||||
|
x_is_odd = PyObject_IsTrue(temp);
|
||||||
|
Py_DECREF(temp);
|
||||||
|
if (x_is_odd == -1) {
|
||||||
|
Py_DECREF(x);
|
||||||
|
goto Done;
|
||||||
|
}
|
||||||
|
whole_us = 2.0 * round((leftover_us + x_is_odd) * 0.5) - x_is_odd;
|
||||||
|
}
|
||||||
|
|
||||||
temp = PyLong_FromLong((long)whole_us);
|
temp = PyLong_FromLong((long)whole_us);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue