mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix trailing whitespaces in C and Python files. (#4131)

Browse source
This commit is contained in:
Serhiy Storchaka 2017-10-26 17:00:13 +03:00 • committed by GitHub
parent 2b5cbbb13c
commit d94ef8fe94
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/pytime.h
View file

@ -30,14 +30,14 @@ typedef enum {
/* Round to nearest with ties going to nearest even integer. /* Round to nearest with ties going to nearest even integer.
For example, used to round from a Python float. */ For example, used to round from a Python float. */
_PyTime_ROUND_HALF_EVEN=2, _PyTime_ROUND_HALF_EVEN=2,
/* Round away from zero /* Round away from zero
For example, used for timeout. _PyTime_ROUND_CEILING rounds For example, used for timeout. _PyTime_ROUND_CEILING rounds
-1e-9 to 0 milliseconds which causes bpo-31786 issue. -1e-9 to 0 milliseconds which causes bpo-31786 issue.
_PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
the timeout sign as expected. select.poll(timeout) must block the timeout sign as expected. select.poll(timeout) must block
for negative values." */ for negative values." */
_PyTime_ROUND_UP=3, _PyTime_ROUND_UP=3,
/* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
used for timeouts. */ used for timeouts. */
_PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
} _PyTime_round_t; } _PyTime_round_t;

2
Lib/email/utils.py
View file

@ -217,7 +217,7 @@ def parsedate_to_datetime(data):
def parseaddr(addr): def parseaddr(addr):
""" """
Parse addr into its constituent realname and email address parts. Parse addr into its constituent realname and email address parts.
Return a tuple of realname and email address, unless the parse fails, in Return a tuple of realname and email address, unless the parse fails, in
which case return a 2-tuple of ('', ''). which case return a 2-tuple of ('', '').
""" """

2
Lib/test/test_code.py
View file

@ -231,7 +231,7 @@ if check_impl_detail(cpython=True) and ctypes is not None:
SetExtra.restype = ctypes.c_int SetExtra.restype = ctypes.c_int
GetExtra = py._PyCode_GetExtra GetExtra = py._PyCode_GetExtra
GetExtra.argtypes = (ctypes.py_object, ctypes.c_ssize_t, GetExtra.argtypes = (ctypes.py_object, ctypes.c_ssize_t,
ctypes.POINTER(ctypes.c_voidp)) ctypes.POINTER(ctypes.c_voidp))
GetExtra.restype = ctypes.c_int GetExtra.restype = ctypes.c_int

2
Lib/test/test_inspect.py
View file

@ -2021,7 +2021,7 @@ class TestSignatureObject(unittest.TestCase):
((('args', ..., ..., 'var_positional'),), ...)) ((('args', ..., ..., 'var_positional'),), ...))
self.assertEqual(self.signature(A.f3), self.assertEqual(self.signature(A.f3),
((('args', ..., ..., 'var_positional'),), ...)) ((('args', ..., ..., 'var_positional'),), ...))
self.assertEqual(self.signature(A.f4), self.assertEqual(self.signature(A.f4),
((('args', ..., ..., 'var_positional'), ((('args', ..., ..., 'var_positional'),
('kwargs', ..., ..., 'var_keyword')), ...)) ('kwargs', ..., ..., 'var_keyword')), ...))
@cpython_only @cpython_only

6
PC/_testconsole.c
View file

@ -46,7 +46,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
/*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/ /*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/
{ {
INPUT_RECORD *rec = NULL; INPUT_RECORD *rec = NULL;
if (!PyWindowsConsoleIO_Check(file)) { if (!PyWindowsConsoleIO_Check(file)) {
PyErr_SetString(PyExc_TypeError, "expected raw console object"); PyErr_SetString(PyExc_TypeError, "expected raw console object");
return NULL; return NULL;
@ -59,7 +59,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
if (!rec) if (!rec)
goto error; goto error;
memset(rec, 0, sizeof(INPUT_RECORD) * size); memset(rec, 0, sizeof(INPUT_RECORD) * size);
INPUT_RECORD *prec = rec; INPUT_RECORD *prec = rec;
for (DWORD i = 0; i < size; ++i, ++p, ++prec) { for (DWORD i = 0; i < size; ++i, ++p, ++prec) {
prec->EventType = KEY_EVENT; prec->EventType = KEY_EVENT;
@ -80,7 +80,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
} }
PyMem_Free((void*)rec); PyMem_Free((void*)rec);
Py_RETURN_NONE; Py_RETURN_NONE;
error: error:
if (rec) if (rec)

2
PC/msvcrtmodule.c
View file

@ -353,7 +353,7 @@ msvcrt_ungetch_impl(PyObject *module, char char_value)
/*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/ /*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/
{ {
int res; int res;
_Py_BEGIN_SUPPRESS_IPH _Py_BEGIN_SUPPRESS_IPH
res = _ungetch(char_value); res = _ungetch(char_value);
_Py_END_SUPPRESS_IPH _Py_END_SUPPRESS_IPH