Author: Armin Rigo <ar...@tunes.org> Branch: py3k Changeset: r87314:03f142546f64 Date: 2016-09-22 12:07 +0200 http://bitbucket.org/pypy/pypy/changeset/03f142546f64/
Log: hg merge default diff --git a/rpython/jit/backend/test/zll_stress.py b/rpython/jit/backend/test/zll_stress.py --- a/rpython/jit/backend/test/zll_stress.py +++ b/rpython/jit/backend/test/zll_stress.py @@ -1,7 +1,6 @@ from rpython.jit.backend.test.test_random import check_random_function, Random from rpython.jit.backend.test.test_ll_random import LLtypeOperationBuilder from rpython.jit.backend.detect_cpu import getcpuclass -from rpython.jit.metainterp.resoperation import rop import platform CPU = getcpuclass() diff --git a/rpython/rlib/rposix_stat.py b/rpython/rlib/rposix_stat.py --- a/rpython/rlib/rposix_stat.py +++ b/rpython/rlib/rposix_stat.py @@ -147,13 +147,20 @@ # (we ignore the extra values here for simplicity and portability) def stat_result_reduce(st): return (st[0], st[1], st[2], st[3], st[4], - st[5], st[6], st[7], st[8], st[9], - st[-3], st[-2], st[-1]) + st[5], st[6], st.st_atime, st.st_mtime, st.st_ctime) def stat_result_recreate(tup): - return make_stat_result(tup[:10] + extra_zeroes + tup[-3:]) + atime, mtime, ctime = tup[7:] + result = tup[:7] + result += (int(atime), int(mtime), int(ctime)) + result += extra_zeroes + result += (int((atime - result[7]) * 1e9), + int((mtime - result[8]) * 1e9), + int((ctime - result[9]) * 1e9)) + return make_stat_result(result) s_reduced = annmodel.SomeTuple([lltype_to_annotation(TYPE) - for name, TYPE in PORTABLE_STAT_FIELDS]) + for name, TYPE in PORTABLE_STAT_FIELDS[:7]] + + 3 * [lltype_to_annotation(lltype.Float)]) extra_zeroes = (0,) * (len(STAT_FIELDS) - len(PORTABLE_STAT_FIELDS) - 3) return s_reduced, stat_result_reduce, stat_result_recreate _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit