diff options
| -rw-r--r-- | Include/pytime.h | 4 | ||||
| -rw-r--r-- | Lib/email/utils.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_code.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_inspect.py | 2 | ||||
| -rw-r--r-- | PC/_testconsole.c | 6 | ||||
| -rw-r--r-- | PC/msvcrtmodule.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Include/pytime.h b/Include/pytime.h index 9e1f304fd4..158c460aee 100644 --- a/Include/pytime.h +++ b/Include/pytime.h @@ -30,14 +30,14 @@ typedef enum { /* Round to nearest with ties going to nearest even integer. For example, used to round from a Python float. */ _PyTime_ROUND_HALF_EVEN=2, - /* Round away from zero + /* Round away from zero For example, used for timeout. _PyTime_ROUND_CEILING rounds -1e-9 to 0 milliseconds which causes bpo-31786 issue. _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps the timeout sign as expected. select.poll(timeout) must block for negative values." */ _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. */ _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP } _PyTime_round_t; diff --git a/Lib/email/utils.py b/Lib/email/utils.py index e2bfb362c6..39c2240607 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -217,7 +217,7 @@ def parsedate_to_datetime(data): def parseaddr(addr): """ Parse addr into its constituent realname and email address parts. - + Return a tuple of realname and email address, unless the parse fails, in which case return a 2-tuple of ('', ''). """ diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py index 68537482ac..90cb584ac4 100644 --- a/Lib/test/test_code.py +++ b/Lib/test/test_code.py @@ -231,7 +231,7 @@ if check_impl_detail(cpython=True) and ctypes is not None: SetExtra.restype = ctypes.c_int 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)) GetExtra.restype = ctypes.c_int diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index b194b27aba..bdad38643b 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -2021,7 +2021,7 @@ class TestSignatureObject(unittest.TestCase): ((('args', ..., ..., 'var_positional'),), ...)) self.assertEqual(self.signature(A.f3), ((('args', ..., ..., 'var_positional'),), ...)) - self.assertEqual(self.signature(A.f4), + self.assertEqual(self.signature(A.f4), ((('args', ..., ..., 'var_positional'), ('kwargs', ..., ..., 'var_keyword')), ...)) @cpython_only diff --git a/PC/_testconsole.c b/PC/_testconsole.c index 1c93679e43..23d1286ed4 100644 --- a/PC/_testconsole.c +++ b/PC/_testconsole.c @@ -46,7 +46,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file, /*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/ { INPUT_RECORD *rec = NULL; - + if (!PyWindowsConsoleIO_Check(file)) { PyErr_SetString(PyExc_TypeError, "expected raw console object"); return NULL; @@ -59,7 +59,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file, if (!rec) goto error; memset(rec, 0, sizeof(INPUT_RECORD) * size); - + INPUT_RECORD *prec = rec; for (DWORD i = 0; i < size; ++i, ++p, ++prec) { prec->EventType = KEY_EVENT; @@ -80,7 +80,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file, } PyMem_Free((void*)rec); - + Py_RETURN_NONE; error: if (rec) diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 4797cdc2c0..b1bf28b1ed 100644 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -353,7 +353,7 @@ msvcrt_ungetch_impl(PyObject *module, char char_value) /*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/ { int res; - + _Py_BEGIN_SUPPRESS_IPH res = _ungetch(char_value); _Py_END_SUPPRESS_IPH |