Author: Benjamin Peterson <[email protected]>
Branch:
Changeset: r53298:e0c33346ceb0
Date: 2012-03-11 12:23 -0700
http://bitbucket.org/pypy/pypy/changeset/e0c33346ceb0/
Log: merge heads
diff --git a/pypy/module/__pypy__/interp_time.py
b/pypy/module/__pypy__/interp_time.py
--- a/pypy/module/__pypy__/interp_time.py
+++ b/pypy/module/__pypy__/interp_time.py
@@ -51,7 +51,7 @@
with lltype.scoped_alloc(TIMESPEC) as tp:
ret = c_clock_gettime(clk_id, tp)
if ret != 0:
- raise exception_from_errno(space.w_IOError)
+ raise exception_from_errno(space, space.w_IOError)
return space.wrap(tp.c_tv_sec + tp.c_tv_nsec * 1e-9)
@unwrap_spec(clk_id="c_int")
@@ -59,5 +59,5 @@
with lltype.scoped_alloc(TIMESPEC) as tp:
ret = c_clock_getres(clk_id, tp)
if ret != 0:
- raise exception_from_errno(space.w_IOError)
+ raise exception_from_errno(space, space.w_IOError)
return space.wrap(tp.c_tv_sec + tp.c_tv_nsec * 1e-9)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
