traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37549: os.dup() fails for standard streams on Windows 7 (GH-15389) 

(cherry picked from commit 5be666010e)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
This commit is contained in:
Miss Islington (bot) 2019-08-23 12:04:27 -07:00 committed by GitHub
parent 761e5a7c7f
commit 3921d12174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_os.py
View File

@ -3476,6 +3476,11 @@ class FDInheritanceTests(unittest.TestCase):
self.addCleanup(os.close, fd2) self.addCleanup(os.close, fd2)
self.assertEqual(os.get_inheritable(fd2), False) self.assertEqual(os.get_inheritable(fd2), False)
def test_dup_standard_stream(self):
fd = os.dup(1)
self.addCleanup(os.close, fd)
self.assertGreater(fd, 0)
@unittest.skipUnless(sys.platform == 'win32', 'win32-specific test') @unittest.skipUnless(sys.platform == 'win32', 'win32-specific test')
def test_dup_nul(self): def test_dup_nul(self):
# os.dup() was creating inheritable fds for character files. # os.dup() was creating inheritable fds for character files.

1
Misc/NEWS.d/next/Windows/2019-08-22-09-04-44.bpo-37549.TpKI3M.rst Normal file
View File

@ -0,0 +1 @@
:func:`os.dup` no longer fails for standard streams on Windows 7.

9
Python/fileutils.c
View File

@ -1134,11 +1134,18 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
flags = HANDLE_FLAG_INHERIT; flags = HANDLE_FLAG_INHERIT;
else else
flags = 0; flags = 0;
if (!SetHandleInformation(handle, HANDLE_FLAG_INHERIT, flags)) {
/* This check can be removed once support for Windows 7 ends. */
#define CONSOLE_PSEUDOHANDLE(handle) (((ULONG_PTR)(handle) & 0x3) == 0x3 && \
GetFileType(handle) == FILE_TYPE_CHAR)
if (!CONSOLE_PSEUDOHANDLE(handle) &&
!SetHandleInformation(handle, HANDLE_FLAG_INHERIT, flags)) {
if (raise) if (raise)
PyErr_SetFromWindowsErr(0); PyErr_SetFromWindowsErr(0);
return -1; return -1;
} }
#undef CONSOLE_PSEUDOHANDLE
return 0; return 0;
#else #else