[Python-checkins] bpo-37549: os.dup() fails for standard streams on Windows 7 (GH-15389)
Steve Dower
webhook-mailer at python.org
Fri Aug 23 14:38:45 EDT 2019
https://github.com/python/cpython/commit/5be666010e4df65dc4d831435cc92340ea369f94
commit: 5be666010e4df65dc4d831435cc92340ea369f94
branch: master
author: Zackery Spytz <zspytz at gmail.com>
committer: Steve Dower <steve.dower at python.org>
date: 2019-08-23T11:38:41-07:00
summary:
bpo-37549: os.dup() fails for standard streams on Windows 7 (GH-15389)
files:
A Misc/NEWS.d/next/Windows/2019-08-22-09-04-44.bpo-37549.TpKI3M.rst
M Lib/test/test_os.py
M Python/fileutils.c
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 428593151208..440cd6c1cf73 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -3476,6 +3476,11 @@ def test_dup(self):
self.addCleanup(os.close, fd2)
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')
def test_dup_nul(self):
# os.dup() was creating inheritable fds for character files.
diff --git a/Misc/NEWS.d/next/Windows/2019-08-22-09-04-44.bpo-37549.TpKI3M.rst b/Misc/NEWS.d/next/Windows/2019-08-22-09-04-44.bpo-37549.TpKI3M.rst
new file mode 100644
index 000000000000..5345da80781d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-08-22-09-04-44.bpo-37549.TpKI3M.rst
@@ -0,0 +1 @@
+:func:`os.dup` no longer fails for standard streams on Windows 7.
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 36a3c995a98a..0c05424143af 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1134,11 +1134,18 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
flags = HANDLE_FLAG_INHERIT;
else
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)
PyErr_SetFromWindowsErr(0);
return -1;
}
+#undef CONSOLE_PSEUDOHANDLE
return 0;
#else
More information about the Python-checkins
mailing list