Author: Philip Jenvey <[email protected]>
Branch: py3k-get_clock_info
Changeset: r84771:29ae50a104c7
Date: 2016-05-27 21:26 -0700
http://bitbucket.org/pypy/pypy/changeset/29ae50a104c7/
Log: get tests running
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
@@ -230,21 +230,24 @@
if cConfig.has_gettimeofday:
c_gettimeofday = external('gettimeofday',
- [CConfig.timeval,
+ [cConfig.timeval,
rffi.VOIDP],
rffi.INT)
if _WIN:
GetSystemTimeAsFileTime = external('GetSystemTimeAsFileTime',
[rwin32.FILETIME],
lltype.VOID)
- def gettimeofday(space, w_info=None):
- with lltype.scoped_alloc(rwin32.FILETIME) as system_time,
+ def gettimeofday(space, w_info=None):
+ return space.w_None
+ """
+ with lltype.scoped_alloc(rwin32.FILETIME) as system_time,
GetSystemTimeAsFileTime(system_time)
seconds = float(timeval.tv_sec) + timeval.tv_usec * 1e-6
return space.wrap(seconds)
+ """
else:
def gettimeofday(space, w_info=None):
with lltype.scoped_alloc(CConfig.timeval) as timeval:
@@ -262,7 +265,7 @@
return space.wrap(seconds)
-u
+
TM_P = lltype.Ptr(tm)
c_time = external('time', [rffi.TIME_TP], rffi.TIME_T)
c_gmtime = external('gmtime', [rffi.TIME_TP], TM_P,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
