mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.5 (#28184)

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-19 22:17:16 -07:00
commit e2e792d98f
7 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/_io/winconsoleio.c
View file

@ -44,7 +44,7 @@ char _get_console_type(HANDLE handle) {
if (handle == INVALID_HANDLE_VALUE)
return '\0';
if (!GetConsoleMode(handle, &mode))
return '\0';
@ -803,7 +803,7 @@ _io__WindowsConsoleIO_readall_impl(winconsoleio *self)
bytes_size = WideCharToMultiByte(CP_UTF8, 0, buf, len,
NULL, 0, NULL, NULL);
Py_END_ALLOW_THREADS
if (!bytes_size) {
DWORD err = GetLastError();
PyMem_Free(buf);
@ -854,7 +854,7 @@ _io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size)
{
PyObject *bytes;
Py_ssize_t bytes_size;
if (self->handle == INVALID_HANDLE_VALUE)
return err_closed();
if (!self->readable)
@ -929,7 +929,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b)
wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, NULL, 0);
}
Py_END_ALLOW_THREADS
if (!wlen)
return PyErr_SetFromWindowsErr(0);
@ -956,7 +956,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b)
} else
res = 0;
Py_END_ALLOW_THREADS
if (!res) {
DWORD err = GetLastError();
PyMem_Free(wbuf);
@ -996,7 +996,7 @@ _io__WindowsConsoleIO_isatty_impl(winconsoleio *self)
{
if (self->handle == INVALID_HANDLE_VALUE)
return err_closed();
Py_RETURN_TRUE;
}