mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #15478: Use source filename in OSError, not destination filename

Browse source 
And other fixes for Windows:

 * rename, replace and link require arguments of the same type on Windows
 * readlink only supports unicode filenames on Windows
 * os.open() specifies the filename on OSError
This commit is contained in:
Victor Stinner 2012-10-31 22:47:43 +01:00
parent a0c811e439
commit afe1706457
2 changed files with 53 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/posixmodule.c
View file

@ -3054,7 +3054,7 @@ posix_link(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (!result) {
return_value = path_error(&dst);
return_value = path_error(&src);
goto exit;
}
#else
@ -3234,7 +3234,6 @@ posix_listdir(PyObject *self, PyObject *args, PyObject *kwargs)
if (error == ERROR_FILE_NOT_FOUND)
goto exit;
Py_DECREF(list);
path.func = "FindFirstFile";
list = path_error(&path);
goto exit;
}
@ -3263,7 +3262,6 @@ posix_listdir(PyObject *self, PyObject *args, PyObject *kwargs)
it got to the end of the directory. */
if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
Py_DECREF(list);
path.func = "FindNextFile";
list = path_error(&path);
goto exit;
}
@ -3782,7 +3780,7 @@ internal_rename(PyObject *args, PyObject *kwargs, int is_replace)
Py_END_ALLOW_THREADS
if (!result) {
return_value = path_error(&dst);
return_value = path_error(&src);
goto exit;
}
@ -6707,7 +6705,7 @@ posix_symlink(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (result) {
return_value = path_error(&dst);
return_value = path_error(&src);
goto exit;
}
#endif
@ -7059,12 +7057,6 @@ posix_open(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (fd == -1) {
#ifdef MS_WINDOWS
/* force use of posix_error here for exact backwards compatibility */
if (path.wide)
return_value = posix_error();
else
#endif
return_value = path_error(&path);
goto exit;
}