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 /Modules | |
| 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 'Modules')
| -rw-r--r-- | Modules/_io/winconsoleio.c | 12 | ||||
| -rw-r--r-- | Modules/_struct.c | 2 | ||||
| -rw-r--r-- | Modules/expat/pyexpatns.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c index 7d13be5..0bf4ddf 100644 --- a/Modules/_io/winconsoleio.c +++ b/Modules/_io/winconsoleio.c @@ -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; } diff --git a/Modules/_struct.c b/Modules/_struct.c index 0820961..796d168 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -486,7 +486,7 @@ nu_halffloat(const char *p, const formatdef *f) return unpack_halffloat(p, 1); #else return unpack_halffloat(p, 0); -#endif +#endif } static PyObject * diff --git a/Modules/expat/pyexpatns.h b/Modules/expat/pyexpatns.h index 999c5c7..cfb742e 100644 --- a/Modules/expat/pyexpatns.h +++ b/Modules/expat/pyexpatns.h @@ -26,7 +26,7 @@ * http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115 * * The list of relevant exported symbols can be had with this command: - * + * nm pyexpat.so \ | grep -v " [a-zBUA] " \ | grep -v "_fini\|_init\|initpyexpat" |