[pypy-commit] pypy default: also apply some optimizations to timedelta creation

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r62007:043d831e8736
Date: 2013-03-04 06:25 -0500
http://bitbucket.org/pypy/pypy/changeset/043d831e8736/

Log:	also apply some optimizations to timedelta creation

diff --git a/lib_pypy/datetime.py b/lib_pypy/datetime.py
--- a/lib_pypy/datetime.py
+++ b/lib_pypy/datetime.py
@@ -490,8 +490,8 @@
             daysecondsfrac, daysecondswhole = _math.modf(dayfrac * (24.*3600.))
             assert daysecondswhole == int(daysecondswhole)  # can't overflow
             s = int(daysecondswhole)
-            assert days == long(days)
-            d = long(days)
+            assert days == int(days)
+            d = int(days)
         else:
             daysecondsfrac = 0.0
             d = days
@@ -503,8 +503,8 @@
 
         if isinstance(seconds, float):
             secondsfrac, seconds = _math.modf(seconds)
-            assert seconds == long(seconds)
-            seconds = long(seconds)
+            assert seconds == int(seconds)
+            seconds = int(seconds)
             secondsfrac += daysecondsfrac
             assert abs(secondsfrac) <= 2.0
         else:
@@ -527,14 +527,14 @@
 
         if isinstance(microseconds, float):
             microseconds += usdouble
-            microseconds = round(microseconds, 0)
+            microseconds = _round(microseconds)
             seconds, microseconds = divmod(microseconds, 1e6)
             assert microseconds == int(microseconds)
-            assert seconds == long(seconds)
+            assert seconds == int(seconds)
             days, seconds = divmod(seconds, 24.*3600.)
-            assert days == long(days)
+            assert days == int(days)
             assert seconds == int(seconds)
-            d += long(days)
+            d += int(days)
             s += int(seconds)   # can't overflow
             assert isinstance(s, int)
             assert abs(s) <= 3 * 24 * 3600
@@ -547,7 +547,7 @@
             assert abs(s) <= 3 * 24 * 3600
             microseconds = float(microseconds)
             microseconds += usdouble
-            microseconds = round(microseconds, 0)
+            microseconds = _round(microseconds)
         assert abs(s) <= 3 * 24 * 3600
         assert abs(microseconds) < 3.1e6