diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-20 05:17:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-20 05:17:16 (GMT) |
| commit | e2e792d98feef833eaff28d8fe1249953c9da6ca (patch) | |
| tree | 447b551b4fb0d05e016403ec4e7b10995c71c9ef /Parser/myreadline.c | |
| parent | 1daf6da2c8a9a0229df84057a4ec142d69dfac9d (diff) | |
| parent | 918aa89483817c63c6e34a4cbdae0d17d19372e6 (diff) | |
| download | cpython-e2e792d98feef833eaff28d8fe1249953c9da6ca.zip cpython-e2e792d98feef833eaff28d8fe1249953c9da6ca.tar.gz cpython-e2e792d98feef833eaff28d8fe1249953c9da6ca.tar.bz2 | |
merge 3.5 (#28184)
Diffstat (limited to 'Parser/myreadline.c')
| -rw-r--r-- | Parser/myreadline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Parser/myreadline.c b/Parser/myreadline.c index c8b92da..a8f23b7 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -172,7 +172,7 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn) buf = PyMem_RawMalloc(u8len + 1); u8len = WideCharToMultiByte(CP_UTF8, 0, wbuf, total_read, buf, u8len, NULL, NULL); buf[u8len] = '\0'; - + exit: if (wbuf != wbuf_local) PyMem_RawFree(wbuf); @@ -204,11 +204,11 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt) #ifdef MS_WINDOWS if (!Py_LegacyWindowsStdioFlag && sys_stdin == stdin) { HANDLE hStdIn; - + _Py_BEGIN_SUPPRESS_IPH hStdIn = (HANDLE)_get_osfhandle(fileno(sys_stdin)); _Py_END_SUPPRESS_IPH - + if (_get_console_type(hStdIn) == 'r') { fflush(sys_stdout); if (prompt) |