From 33a6da9971a923ceaaee1406d0feaa64b8d1759a Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Tue, 15 Aug 2000 00:46:38 +0000 Subject: 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. --- Modules/posixmodule.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index e7f35cf..d7755bf 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -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 -- cgit v0.12