Author: Arjun Naik <[email protected]>
Branch: py3.3
Changeset: r75153:9a110e6e733e
Date: 2014-07-26 15:11 +0200
http://bitbucket.org/pypy/pypy/changeset/9a110e6e733e/
Log: reapply 8ccff189b82f: Changed the _get_inttime() to raise
OverflowError.
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -368,7 +368,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/time/test/test_time.py
b/pypy/module/time/test/test_time.py
--- a/pypy/module/time/test/test_time.py
+++ b/pypy/module/time/test/test_time.py
@@ -42,7 +42,7 @@
res = time.ctime(0)
assert isinstance(res, str)
time.ctime(time.time())
- raises(ValueError, time.ctime, 1E200)
+ raises(OverflowError, time.ctime, 1E200)
raises(OverflowError, time.ctime, 10**900)
for year in [-100, 100, 1000, 2000, 10000]:
try:
@@ -68,8 +68,8 @@
assert 0 <= (t1 - t0) < 1.2
t = time.time()
assert time.gmtime(t) == time.gmtime(t)
- raises(ValueError, time.gmtime, 2**64)
- raises(ValueError, time.gmtime, -2**64)
+ raises(OverflowError, time.gmtime, 2**64)
+ raises(OverflowError, time.gmtime, -2**64)
def test_localtime(self):
import time
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
