[pypy-commit] pypy py3.3: Changed the _get_inttime() to raise OverflowError.

Arjun Naik noreply at buildbot.pypy.org
Sat Jul 26 15:54:09 CEST 2014


Author: Arjun Naik <arjun at arjunnaik.in>
Branch: py3.3
Changeset: r72514:8ccff189b82f
Date: 2014-07-26 15:11 +0200
http://bitbucket.org/pypy/pypy/changeset/8ccff189b82f/

Log:	Changed the _get_inttime() to raise OverflowError.

diff --git a/pypy/module/rctime/interp_time.py b/pypy/module/rctime/interp_time.py
--- a/pypy/module/rctime/interp_time.py
+++ b/pypy/module/rctime/interp_time.py
@@ -364,7 +364,7 @@
     # input doesn't fit in a time_t; call it an error.
     diff = seconds - rffi.cast(lltype.Float, t)
     if diff <= -1.0 or diff >= 1.0:
-        raise OperationError(space.w_ValueError,
+        raise OperationError(space.w_OverflowError,
                       space.wrap("timestamp out of range for platform time_t"))
     return t
 
diff --git a/pypy/module/rctime/test/test_rctime.py b/pypy/module/rctime/test/test_rctime.py
--- a/pypy/module/rctime/test/test_rctime.py
+++ b/pypy/module/rctime/test/test_rctime.py
@@ -42,7 +42,7 @@
         res = rctime.ctime(0)
         assert isinstance(res, str)
         rctime.ctime(rctime.time())
-        raises(ValueError, rctime.ctime, 1E200)
+        raises(OverflowError, rctime.ctime, 1E200)
         raises(OverflowError, rctime.ctime, 10**900)
         for year in [-100, 100, 1000, 2000, 10000]:
             try:
@@ -68,8 +68,8 @@
         assert 0 <= (t1 - t0) < 1.2
         t = rctime.time()
         assert rctime.gmtime(t) == rctime.gmtime(t)
-        raises(ValueError, rctime.gmtime, 2**64)
-        raises(ValueError, rctime.gmtime, -2**64)
+        raises(OverflowError, rctime.gmtime, 2**64)
+        raises(OverflowError, rctime.gmtime, -2**64)
 
     def test_localtime(self):
         import time as rctime


More information about the pypy-commit mailing list