diff options
| -rw-r--r-- | Lib/test/test_ntpath.py | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 237aec0..6464950 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -248,7 +248,7 @@ class TestNtpath(unittest.TestCase): self.assertFalse(ntpath.sameopenfile(tf1.fileno(), tf2.fileno())) # Make sure invalid values don't cause issues on win32 if sys.platform == "win32": - with self.assertRaises(ValueError): + with self.assertRaises(OSError): # Invalid file descriptors shouldn't display assert # dialogs (#4804) ntpath.sameopenfile(-1, -1) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 34190dd..01da01d 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2803,14 +2803,12 @@ posix__getfileinformation(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "i:_getfileinformation", &fd)) return NULL; - if (!_PyVerify_fd(fd)) { - PyErr_SetString(PyExc_ValueError, "received invalid file descriptor"); - return NULL; - } + if (!_PyVerify_fd(fd)) + return posix_error(); hFile = (HANDLE)_get_osfhandle(fd); if (hFile == INVALID_HANDLE_VALUE) - return win32_error("_getfileinformation", NULL); + return posix_error(); if (!GetFileInformationByHandle(hFile, &info)) return win32_error("_getfileinformation", NULL); |