merge 3.5 (#28184) · pythoncapi/cpython@e2e792d · GitHub
Skip to content

Commit e2e792d

Browse files
committed
merge 3.5 (python#28184)
2 parents 1daf6da + 918aa89 commit e2e792d

7 files changed

Lines changed: 31 additions & 31 deletions

File tree

Include/pyfpe.h

Lines changed: 18 additions & 18 deletions

Include/pyport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
747747
#define PY_LITTLE_ENDIAN 1
748748
#endif
749749

750-
#ifdef Py_BUILD_CORE
750+
#ifdef Py_BUILD_CORE
751751
/*
752752
* Macros to protect CRT calls against instant termination when passed an
753753
* invalid parameter (issue23524).

Misc/coverity_model.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static PyObject *
139139
build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
140140
{
141141
PyObject *result;
142-
142+
143143
__coverity_tainted_data_sanitize__(y);
144144
__coverity_tainted_data_sanitize__(m);
145145
__coverity_tainted_data_sanitize__(d);

Modules/_io/winconsoleio.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ char _get_console_type(HANDLE handle) {
4444

4545
if (handle == INVALID_HANDLE_VALUE)
4646
return '\0';
47-
47+
4848
if (!GetConsoleMode(handle, &mode))
4949
return '\0';
5050

@@ -803,7 +803,7 @@ _io__WindowsConsoleIO_readall_impl(winconsoleio *self)
803803
bytes_size = WideCharToMultiByte(CP_UTF8, 0, buf, len,
804804
NULL, 0, NULL, NULL);
805805
Py_END_ALLOW_THREADS
806-
806+
807807
if (!bytes_size) {
808808
DWORD err = GetLastError();
809809
PyMem_Free(buf);
@@ -854,7 +854,7 @@ _io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size)
854854
{
855855
PyObject *bytes;
856856
Py_ssize_t bytes_size;
857-
857+
858858
if (self->handle == INVALID_HANDLE_VALUE)
859859
return err_closed();
860860
if (!self->readable)
@@ -929,7 +929,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b)
929929
wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, NULL, 0);
930930
}
931931
Py_END_ALLOW_THREADS
932-
932+
933933
if (!wlen)
934934
return PyErr_SetFromWindowsErr(0);
935935

@@ -956,7 +956,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b)
956956
} else
957957
res = 0;
958958
Py_END_ALLOW_THREADS
959-
959+
960960
if (!res) {
961961
DWORD err = GetLastError();
962962
PyMem_Free(wbuf);
@@ -996,7 +996,7 @@ _io__WindowsConsoleIO_isatty_impl(winconsoleio *self)
996996
{
997997
if (self->handle == INVALID_HANDLE_VALUE)
998998
return err_closed();
999-
999+
10001000
Py_RETURN_TRUE;
10011001
}
10021002

Modules/_struct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ nu_halffloat(const char *p, const formatdef *f)
486486
return unpack_halffloat(p, 1);
487487
#else
488488
return unpack_halffloat(p, 0);
489-
#endif
489+
#endif
490490
}
491491

492492
static PyObject *

Modules/expat/pyexpatns.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115
2727
*
2828
* The list of relevant exported symbols can be had with this command:
29-
*
29+
*
3030
nm pyexpat.so \
3131
| grep -v " [a-zBUA] " \
3232
| grep -v "_fini\|_init\|initpyexpat"

Parser/myreadline.c

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)