mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix #13327. Remove the need for an explicit None as the second argument to

Browse source 
os.utime in order to update to the current time. The second argument is now
optional.
This commit is contained in:
Brian Curtin 2011-11-06 13:41:17 -06:00
parent 9589ab1745
commit 52fbea1d87
4 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/posixmodule.c
View file

@ -3543,7 +3543,7 @@ static PyObject *
posix_utime(PyObject *self, PyObject *args)
{
#ifdef MS_WINDOWS
PyObject *arg;
PyObject *arg = NULL;
PyObject *obwpath;
wchar_t *wpath = NULL;
PyObject *oapath;
@ -3554,7 +3554,7 @@ posix_utime(PyObject *self, PyObject *args)
FILETIME atime, mtime;
PyObject *result = NULL;
if (PyArg_ParseTuple(args, "UO|:utime", &obwpath, &arg)) {
if (PyArg_ParseTuple(args, "U|O:utime", &obwpath, &arg)) {
wpath = PyUnicode_AsUnicode(obwpath);
if (wpath == NULL)
return NULL;
@ -3571,7 +3571,7 @@ posix_utime(PyObject *self, PyObject *args)
are also valid. */
PyErr_Clear();
if (!PyArg_ParseTuple(args, "O&O:utime",
if (!PyArg_ParseTuple(args, "O&|O:utime",
PyUnicode_FSConverter, &oapath, &arg))
return NULL;
@ -3589,7 +3589,7 @@ posix_utime(PyObject *self, PyObject *args)
Py_DECREF(oapath);
}
if (arg == Py_None) {
if (!arg || (arg == Py_None)) {
SYSTEMTIME now;
GetSystemTime(&now);
if (!SystemTimeToFileTime(&now, &mtime) ||
@ -3633,13 +3633,13 @@ done:
time_t atime, mtime;
long ausec, musec;
int res;
PyObject* arg;
PyObject* arg = NULL;
if (!PyArg_ParseTuple(args, "O&O:utime",
if (!PyArg_ParseTuple(args, "O&|O:utime",
PyUnicode_FSConverter, &opath, &arg))
return NULL;
path = PyBytes_AsString(opath);
if (arg == Py_None) {
if (!arg || (arg == Py_None)) {
/* optional time values not given */
Py_BEGIN_ALLOW_THREADS
res = utime(path, NULL);