Fix for bug #110670 - Win32 os.listdir raises confusing errors:

The existing win32_error() function now returns the new(ish) WindowsError, ensuring we get correct error messages.
This commit is contained in:
Mark Hammond 2000-08-15 00:46:38 +00:00
parent 557a044f74
commit 33a6da9971
1 changed files with 7 additions and 3 deletions

View File

@ -349,12 +349,16 @@ posix_error_with_filename(char* name)
static PyObject *
win32_error(char* function, char* filename)
{
/* XXX this could be improved */
/* XXX We should pass the function name along in the future.
(_winreg.c also wants to pass the function name.)
This would however require an additional param to the
Windows error object, which is non-trivial.
*/
errno = GetLastError();
if (filename)
return PyErr_SetFromErrnoWithFilename(PyExc_OSError, filename);
return PyErr_SetFromWindowsErrWithFilename(errno, filename);
else
return PyErr_SetFromErrno(PyExc_OSError);
return PyErr_SetFromWindowsErr(errno);
}
#endif