Skip to content

Commit 5e437fb

Browse files
segevfinersegevfiner
authored
bpo-30555: Fix WindowsConsoleIO fails in the presence of fd redirection (pythonGH-1927)
This works by not caching the handle and instead getting the handle from the file descriptor each time, so that if the actual handle changes by fd redirection closing/opening the console handle beneath our feet, we will keep working correctly.
1 parent 6b59e66 commit 5e437fb

File tree

10 files changed

+144
-125
lines changed

10 files changed

+144
-125
lines changed

‎Include/cpython/fileutils.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,12 @@ PyAPI_FUNC(int) _Py_dup(int fd);
161161
PyAPI_FUNC(int) _Py_get_blocking(int fd);
162162

163163
PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking);
164-
#endif /* !MS_WINDOWS */
164+
#else /* MS_WINDOWS */
165+
PyAPI_FUNC(void*) _Py_get_osfhandle_noraise(int fd);
166+
167+
PyAPI_FUNC(void*) _Py_get_osfhandle(int fd);
168+
169+
PyAPI_FUNC(int) _Py_open_osfhandle_noraise(void *handle, int flags);
170+
171+
PyAPI_FUNC(int) _Py_open_osfhandle(void *handle, int flags);
172+
#endif /* MS_WINDOWS */

‎Misc/NEWS.d/next/Windows/2017-12-16-12-23-51.bpo-30555.3ybjly.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix ``WindowsConsoleIO`` errors in the presence of fd redirection. Patch by
2+
Segev Finer.

‎Modules/_io/clinic/winconsoleio.c.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_close__doc__,
88
"close($self, /)\n"
99
"--\n"
1010
"\n"
11-
"Close the handle.\n"
11+
"Close the console object.\n"
1212
"\n"
13-
"A closed handle cannot be used for further I/O operations. close() may be\n"
14-
"called more than once without error.");
13+
"A closed console object cannot be used for further I/O operations.\n"
14+
"close() may be called more than once without error.");
1515

1616
#define _IO__WINDOWSCONSOLEIO_CLOSE_METHODDEF \
1717
{"close", (PyCFunction)_io__WindowsConsoleIO_close, METH_NOARGS, _io__WindowsConsoleIO_close__doc__},
@@ -110,10 +110,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_fileno__doc__,
110110
"fileno($self, /)\n"
111111
"--\n"
112112
"\n"
113-
"Return the underlying file descriptor (an integer).\n"
114-
"\n"
115-
"fileno is only set when a file descriptor is used to open\n"
116-
"one of the standard streams.");
113+
"Return the underlying file descriptor (an integer).");
117114

118115
#define _IO__WINDOWSCONSOLEIO_FILENO_METHODDEF \
119116
{"fileno", (PyCFunction)_io__WindowsConsoleIO_fileno, METH_NOARGS, _io__WindowsConsoleIO_fileno__doc__},
@@ -381,4 +378,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored))
381378
#ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
382379
#define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
383380
#endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */
384-
/*[clinic end generated code: output=a28b3120fa53b256 input=a9049054013a1b77]*/
381+
/*[clinic end generated code: output=48080572ffee22f5 input=a9049054013a1b77]*/

0 commit comments

Comments
 (0)