From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 15 Aug 2000 00:46:38 +0000 (+0000)
Subject: Fix for bug #110670 - Win32 os.listdir raises confusing errors:
X-Git-Tag: v2.0b1~457
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33a6da9971a923ceaaee1406d0feaa64b8d1759a;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index e7f35cfdbd2f..d7755bf95ee8 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