ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #20517: Functions in the os module that accept two filenames

Browse source 
now register both filenames in the exception on failure.
This required adding new C API functions allowing OSError exceptions
to reference two filenames instead of one.
This commit is contained in:
Larry Hastings 2014-02-09 22:05:19 -08:00
parent dc62b7e261
commit b082731fbb
10 changed files with 380 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/posixmodule.c
View file

@ -1313,6 +1313,19 @@ path_error(path_t *path)
}
static PyObject *
path_error2(path_t *path, path_t *path2)
{
#ifdef MS_WINDOWS
return PyErr_SetExcFromWindowsErrWithFilenameObjects(PyExc_OSError,
0, path->object, path2->object);
#else
return PyErr_SetFromErrnoWithFilenameObjects(PyExc_OSError,
path->object, path2->object);
#endif
}
/* POSIX generic methods */
static PyObject *
@ -3518,7 +3531,7 @@ posix_link(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (!result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
#else
@ -3536,7 +3549,7 @@ posix_link(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
#endif
@ -4284,7 +4297,7 @@ internal_rename(PyObject *args, PyObject *kwargs, int is_replace)
Py_END_ALLOW_THREADS
if (!result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
@ -4299,7 +4312,7 @@ internal_rename(PyObject *args, PyObject *kwargs, int is_replace)
Py_END_ALLOW_THREADS
if (result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
#endif
@ -7345,7 +7358,7 @@ posix_symlink(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (!result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
@ -7361,7 +7374,7 @@ posix_symlink(PyObject *self, PyObject *args, PyObject *kwargs)
Py_END_ALLOW_THREADS
if (result) {
return_value = path_error(&src);
return_value = path_error2(&src, &dst);
goto exit;
}
#endif