Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r62865:b3acd17f6946
Date: 2013-03-28 21:30 -0700
http://bitbucket.org/pypy/pypy/changeset/b3acd17f6946/
Log: pass accept2dyear through space.is_true
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
@@ -432,7 +432,7 @@
if y < 1000:
w_accept2dyear = _get_module_object(space, "accept2dyear")
- accept2dyear = space.int_w(w_accept2dyear)
+ accept2dyear = space.is_true(w_accept2dyear)
if accept2dyear:
if 69 <= y <= 99:
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
@@ -166,6 +166,17 @@
finally:
rctime.accept2dyear = accept2dyear
+ def test_accept2dyear_bad(self):
+ import time as rctime
+ class X:
+ def __bool__(self):
+ raise RuntimeError('boo')
+ orig, rctime.accept2dyear = rctime.accept2dyear, X()
+ try:
+ raises(RuntimeError, rctime.asctime, (200,) + (0,) * 8)
+ finally:
+ rctime.accept2dyear = orig
+
def test_struct_time(self):
import time as rctime
raises(TypeError, rctime.struct_time)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
