Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r84697:682e91ff6df6
Date: 2016-05-25 23:25 -0700
http://bitbucket.org/pypy/pypy/changeset/682e91ff6df6/
Log: rearrange
diff --git a/pypy/module/posix/interp_posix.py
b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1430,8 +1430,8 @@
# here
raise wrap_oserror(space, e)
elif rposix.HAVE_FUTIMES:
- do_utimes(space, rposix.futimes, path.as_fd,
- atime_s, atime_ns, mtime_s, mtime_ns, now)
+ do_utimes(space, rposix.futimes, path.as_fd, now,
+ atime_s, atime_ns, mtime_s, mtime_ns)
return
if rposix.HAVE_UTIMENSAT:
@@ -1458,15 +1458,15 @@
if path.as_bytes is None:
raise oefmt(space.w_NotImplementedError,
"utime: unsupported value for 'path'")
- do_utimes(space, rposix.lutimes, path.as_bytes,
- atime_s, atime_ns, mtime_s, mtime_ns, now)
+ do_utimes(space, rposix.lutimes, path.as_bytes, now,
+ atime_s, atime_ns, mtime_s, mtime_ns)
return
if not follow_symlinks:
raise argument_unavailable(space, "utime", "follow_symlinks")
- do_utimes(space, _dispatch_utime, path,
- atime_s, atime_ns, mtime_s, mtime_ns, now)
+ do_utimes(space, _dispatch_utime, path, now,
+ atime_s, atime_ns, mtime_s, mtime_ns)
@specialize.argtype(1)
def _dispatch_utime(path, times):
@@ -1480,7 +1480,7 @@
return rposix.utime(path.as_bytes, times)
@specialize.arg(1)
-def do_utimes(space, func, arg, atime_s, atime_ns, mtime_s, mtime_ns, now):
+def do_utimes(space, func, arg, now, atime_s, atime_ns, mtime_s, mtime_ns):
"""Common implementation for f/l/utimes"""
try:
if now:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
