commit 8acde7dccebd914ec4235f3ed1e9eef53a300978
author Steve Dower <steve.dower@microsoft.com> Sat Mar 07 18:14:07 2015 -0800
committer Steve Dower <steve.dower@microsoft.com> Sat Mar 07 18:14:07 2015 -0800
tree 3af6da4a9ba7c3da9f4c1e8bb3fbcfc2c4bd08b6
parent 35a97c0bed8af6cab7ea0fffe374c3369561c444

Issue #23524: Change back to using Windows errors for _Py_fstat instead of the errno shim.

Modules/_io/fileio.c

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index ab9eb8c..0f226ea 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -182,7 +182,13 @@
 {
 #if defined(HAVE_FSTAT) || defined(MS_WINDOWS)
     struct _Py_stat_struct buf;
-    if (_Py_fstat(fd, &buf) < 0 && errno == EBADF) {
+    if (_Py_fstat(fd, &buf) < 0 &&
+#ifdef MS_WINDOWS
+        GetLastError() == ERROR_INVALID_HANDLE
+#else
+        errno == EBADF
+#endif
+        ) {
         PyObject *exc;
         char *msg = strerror(EBADF);
         exc = PyObject_CallFunction(PyExc_OSError, "(is)",

Modules/signalmodule.c

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 598bc8a..3ad8ebb 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -560,7 +560,7 @@
             }
 
             if (_Py_fstat(fd, &st) != 0) {
-                PyErr_SetFromErrno(PyExc_OSError);
+                PyErr_SetExcFromWindowsErr(PyExc_OSError, GetLastError());
                 return NULL;
             }