diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-08 23:09:21 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-08 23:09:21 (GMT) |
| commit | cd5d765b0ee861509b14a1f21b630b8fb6eb258f (patch) | |
| tree | 417002424af5283e17745db9ec5f6187578fff87 /Lib | |
| parent | 7667f58151d5efbbae4f0b1d7178f99dad0d74c0 (diff) | |
| download | cpython-cd5d765b0ee861509b14a1f21b630b8fb6eb258f.zip cpython-cd5d765b0ee861509b14a1f21b630b8fb6eb258f.tar.gz cpython-cd5d765b0ee861509b14a1f21b630b8fb6eb258f.tar.bz2 | |
cleanup datetime code
remove scories of round half up code and debug code.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/datetime.py | 7 | ||||
| -rw-r--r-- | Lib/test/datetimetester.py | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py index 3f29bc4..b734a74 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -316,13 +316,6 @@ def _divide_and_round(a, b): return q -def _round_half_up(x): - """Round to nearest with ties going away from zero.""" - if x >= 0.0: - return _math.floor(x + 0.5) - else: - return _math.ceil(x - 0.5) - class timedelta: """Represent the difference between two datetime objects. diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 467fbe2..5d2df32 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -679,7 +679,7 @@ class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase): us_per_day = us_per_hour * 24 eq(td(days=.4/us_per_day), 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), td) + eq(td(days=.4/us_per_day, hours=.2/us_per_hour), td(microseconds=1)) eq(td(days=-.4/us_per_day), td(0)) eq(td(hours=-.2/us_per_hour), td(0)) |