From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 5 Dec 2010 04:16:47 +0000 (+0000)
Subject: Should use posix_error here.
X-Git-Tag: v3.2b1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26253bb09e3283922b01f563680a0ad3791235ed;p=python

Should use posix_error here.
---

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 237aec01f4..6464950982 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 34190ddba5..01da01df28 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);