diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 14:21:14 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-18 14:21:14 +0200 |
commit | ccbf7d3cf04df239c0d1dd5e15ff69dfbad6ab17 (patch) | |
tree | 2c4f33fc3535466e9ad4602675c55d1c3480a92f /Python/pytime.c | |
parent | cd04cb9ebfe24b736afb100d83e719bb6d47af97 (diff) | |
download | cpython-ccbf7d3cf04df239c0d1dd5e15ff69dfbad6ab17.tar.gz |
Issue #25155: Fix _PyTime_Divide() rounding
_PyTime_Divide() rounding was wrong: copy code from Python default which has
now much better unit tests.
Diffstat (limited to 'Python/pytime.c')
-rw-r--r-- | Python/pytime.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Python/pytime.c b/Python/pytime.c index 85e1ca8388..5a5cdd9c7a 100644 --- a/Python/pytime.c +++ b/Python/pytime.c @@ -305,17 +305,22 @@ _PyTime_AsNanosecondsObject(_PyTime_t t) } static _PyTime_t -_PyTime_Divide(_PyTime_t t, _PyTime_t k, _PyTime_round_t round) +_PyTime_Divide(const _PyTime_t t, const _PyTime_t k, + const _PyTime_round_t round) { assert(k > 1); if (round == _PyTime_ROUND_CEILING) { if (t >= 0) return (t + k - 1) / k; else + return t / k; + } + else { + if (t >= 0) + return t / k; + else return (t - (k - 1)) / k; } - else - return t / k; } _PyTime_t |