]> granicus.if.org Git - python/commitdiff
cleanup datetime code
authorVictor Stinner <victor.stinner@gmail.com>
Tue, 8 Sep 2015 23:09:21 +0000 (01:09 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Tue, 8 Sep 2015 23:09:21 +0000 (01:09 +0200)
remove scories of round half up code and debug code.

Lib/datetime.py
Lib/test/datetimetester.py

index 3f29bc4b7a05723a1da5743e89094a971bf32ceb..b734a743d0d19cc93a4868657f4cbb8e8c7c5010 100644 (file)
@@ -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.
index 467fbe2f45717df1a1869e162a209ca68a8e6639..5d2df323a9206fbcfa0cb34f492dcc101d3d9d73 100644 (file)
@@ -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))