summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2011-11-07 20:38:24 (GMT)
committerBrian Curtin <brian@python.org>2011-11-07 20:38:24 (GMT)
commit7ef53ef916453fc2d907ae783aa0bd5801aa5575 (patch)
treea6dc0ce7a28682427dc49202426d4d52726c08e9
parentca0fbc02e9971ead5436473e15320652c1fd97c8 (diff)
downloadcpython-7ef53ef916453fc2d907ae783aa0bd5801aa5575.zip
cpython-7ef53ef916453fc2d907ae783aa0bd5801aa5575.tar.gz
cpython-7ef53ef916453fc2d907ae783aa0bd5801aa5575.tar.bz2
Forgot to apply the futimesat change.
-rw-r--r--Modules/posixmodule.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 5ae92fe..da42f3a 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -9686,8 +9686,7 @@ posix_fstatat(PyObject *self, PyObject *args)
#ifdef HAVE_FUTIMESAT
PyDoc_STRVAR(posix_futimesat__doc__,
-"futimesat(dirfd, path, (atime, mtime))\n\
-futimesat(dirfd, path, None)\n\n\
+"futimesat(dirfd, path[, (atime, mtime)])\n\
Like utime() but if path is relative, it is taken as relative to dirfd.\n\
If path is relative and dirfd is the special value AT_FDCWD, then path\n\
is interpreted relative to the current working directory.");
@@ -9698,11 +9697,11 @@ posix_futimesat(PyObject *self, PyObject *args)
PyObject *opath;
char *path;
int res, dirfd;
- PyObject* arg;
+ PyObject* arg = Py_None;
time_t atime, mtime;
long ausec, musec;
- if (!PyArg_ParseTuple(args, "iO&O:futimesat",
+ if (!PyArg_ParseTuple(args, "iO&|O:futimesat",
&dirfd, PyUnicode_FSConverter, &opath, &arg))
return NULL;
path = PyBytes_AsString(opath);