self.addCleanup(os.close, fd2)
self.assertEqual(os.get_inheritable(fd2), False)
+ @unittest.skipUnless(sys.platform == 'win32', 'win32-specific test')
+ def test_dup_nul(self):
+ # os.dup() was creating inheritable fds for character files.
+ fd1 = os.open('NUL', os.O_RDONLY)
+ self.addCleanup(os.close, fd1)
+ fd2 = os.dup(fd1)
+ self.addCleanup(os.close, fd2)
+ self.assertFalse(os.get_inheritable(fd2))
+
@unittest.skipUnless(hasattr(os, 'dup2'), "need os.dup2()")
def test_dup2(self):
fd = os.open(__file__, os.O_RDONLY)
{
#ifdef MS_WINDOWS
HANDLE handle;
- DWORD ftype;
#endif
assert(PyGILState_Check());
return -1;
}
- /* get the file type, ignore the error if it failed */
- ftype = GetFileType(handle);
-
Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
fd = dup(fd);
return -1;
}
- /* Character files like console cannot be make non-inheritable */
- if (ftype != FILE_TYPE_CHAR) {
- if (_Py_set_inheritable(fd, 0, NULL) < 0) {
- _Py_BEGIN_SUPPRESS_IPH
- close(fd);
- _Py_END_SUPPRESS_IPH
- return -1;
- }
+ if (_Py_set_inheritable(fd, 0, NULL) < 0) {
+ _Py_BEGIN_SUPPRESS_IPH
+ close(fd);
+ _Py_END_SUPPRESS_IPH
+ return -1;
}
#elif defined(HAVE_FCNTL_H) && defined(F_DUPFD_CLOEXEC)
Py_BEGIN_ALLOW_THREADS