Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r60354:e4fa0b2b9d64
Date: 2013-01-22 17:30 -0800
http://bitbucket.org/pypy/pypy/changeset/e4fa0b2b9d64/
Log: be less strict about tm_wday to match cpython
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
@@ -448,10 +448,6 @@
raise OperationError(space.w_ValueError,
space.wrap("year out of range"))
- if rffi.getintfield(glob_buf, 'c_tm_wday') < 0:
- raise OperationError(space.w_ValueError,
- space.wrap("day of week out of range"))
-
rffi.setintfield(glob_buf, 'c_tm_year', y - 1900)
rffi.setintfield(glob_buf, 'c_tm_mon',
rffi.getintfield(glob_buf, 'c_tm_mon') - 1)
@@ -460,6 +456,12 @@
rffi.setintfield(glob_buf, 'c_tm_yday',
rffi.getintfield(glob_buf, 'c_tm_yday') - 1)
+ # tm_wday does not need checking of its upper-bound since taking "%
+ # 7" in gettmarg() automatically restricts the range.
+ if rffi.getintfield(glob_buf, 'c_tm_wday') < 0:
+ raise OperationError(space.w_ValueError,
+ space.wrap("day of week out of range"))
+
return glob_buf
def time(space):
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
@@ -113,6 +113,9 @@
if os.name != 'nt':
assert rctime.mktime(rctime.localtime(-1)) == -1
+ res = rctime.mktime((2000, 1, 1, 0, 0, 0, -1, -1, -1))
+ assert rctime.ctime(res) == 'Sat Jan 1 00:00:00 2000'
+
def test_asctime(self):
import time as rctime
rctime.asctime()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
