Skip to content

Commit

Permalink
pythongh-109033: Return filename with os.utime errors
Browse files Browse the repository at this point in the history
The filename was previously intentionally omitted from exception becuase
"it might confuse the user". Uncaught exceptions are not generally a
replacement for user-facing error messages, so obscuring this
information only has the effect of making the programmer's life more
difficult.
  • Loading branch information
rpigott committed Sep 6, 2023
1 parent f9bd6e4 commit 57bd8c6
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -6307,11 +6307,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
_Py_time_t_to_FILE_TIME(utime.mtime_s, utime.mtime_ns, &mtime);
}
if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
/* Avoid putting the file name into the error here,
as that may confuse the user into believing that
something is wrong with the file, when it also
could be the time stamp that gives a problem. */
PyErr_SetFromWindowsErr(0);
PyErr_SetFromWindowsErrWithFilename(0, path->wide);
CloseHandle(hFile);
return NULL;
}
Expand Down Expand Up @@ -6351,8 +6347,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns,
#endif

if (result < 0) {
/* see previous comment about not putting filename in error here */
posix_error();
posix_path_error(path);
return NULL;
}

Expand Down

0 comments on commit 57bd8c6

Please sign in to comment.