Mailman 3 August 2017 - Python-checkins

[3.6] bpo-31071: Avoid masking original TypeError in call with * unpacking (GH-2957) (#2991)
by Serhiy Storchaka 03 Aug '17

03 Aug '17

https://github.com/python/cpython/commit/946a0b69e217ff22a6c056047eab42053e… commit: 946a0b69e217ff22a6c056047eab42053e9a2d5f branch: 3.6 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-03T12:14:35+03:00 summary: [3.6] bpo-31071: Avoid masking original TypeError in call with * unpacking (GH-2957) (#2991) when other arguments are passed. (cherry picked from commit 25e4f77) files: A Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst M Lib/test/test_extcall.py M Python/ceval.c diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index 043df013112..2c1848337b2 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -163,6 +163,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *(broken() for i in range(1))) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenIterable1: ... def __iter__(self): @@ -172,6 +176,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenIterable1()) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenIterable2: ... def __iter__(self): @@ -182,6 +190,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenIterable2()) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenSequence: ... def __getitem__(self, idx): @@ -191,6 +203,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenSequence()) + Traceback (most recent call last): + ... + TypeError: myerror Make sure that the function doesn't stomp the dictionary diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst new file mode 100644 index 00000000000..c34d4751bfa --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst @@ -0,0 +1,2 @@ +Avoid masking original TypeError in call with * unpacking when other +arguments are passed. diff --git a/Python/ceval.c b/Python/ceval.c index 770dfcba89e..8eb78bf4d46 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -64,6 +64,8 @@ static void format_exc_unbound(PyCodeObject *co, int oparg); static PyObject * unicode_concatenate(PyObject *, PyObject *, PyFrameObject *, const _Py_CODEUNIT *); static PyObject * special_lookup(PyObject *, _Py_Identifier *); +static int check_args_iterable(PyObject *func, PyObject *vararg); +static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" @@ -2578,14 +2580,9 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) none_val = _PyList_Extend((PyListObject *)sum, PEEK(i)); if (none_val == NULL) { if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL && - PyErr_ExceptionMatches(PyExc_TypeError)) { - PyObject *func = PEEK(1 + oparg); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after * " - "must be an iterable, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - PEEK(i)->ob_type->tp_name); + PyErr_ExceptionMatches(PyExc_TypeError)) + { + check_args_iterable(PEEK(1 + oparg), PEEK(i)); } Py_DECREF(sum); goto error; @@ -2798,12 +2795,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) if (_PyDict_MergeEx(sum, arg, 2) < 0) { PyObject *func = PEEK(2 + oparg); if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - arg->ob_type->tp_name); + format_kwargs_mapping_error(func, arg); } else if (PyErr_ExceptionMatches(PyExc_KeyError)) { PyObject *exc, *val, *tb; @@ -3370,13 +3362,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) * is not a mapping. */ if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - func = SECOND(); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - kwargs->ob_type->tp_name); + format_kwargs_mapping_error(SECOND(), kwargs); } Py_DECREF(kwargs); goto error; @@ -3389,14 +3375,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) callargs = POP(); func = TOP(); if (!PyTuple_CheckExact(callargs)) { - if (Py_TYPE(callargs)->tp_iter == NULL && - !PySequence_Check(callargs)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after * " - "must be an iterable, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - callargs->ob_type->tp_name); + if (check_args_iterable(func, callargs) < 0) { Py_DECREF(callargs); goto error; } @@ -5351,6 +5330,32 @@ import_all_from(PyObject *locals, PyObject *v) return err; } +static int +check_args_iterable(PyObject *func, PyObject *args) +{ + if (args->ob_type->tp_iter == NULL && !PySequence_Check(args)) { + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after * " + "must be an iterable, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + args->ob_type->tp_name); + return -1; + } + return 0; +} + +static void +format_kwargs_mapping_error(PyObject *func, PyObject *kwargs) +{ + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after ** " + "must be a mapping, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + kwargs->ob_type->tp_name); +} + static void format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj) {

1 0

[3.6] bpo-30978: str.format_map() now passes key lookup exceptions through. (GH-2790) (#2992)
by Serhiy Storchaka 03 Aug '17

03 Aug '17

https://github.com/python/cpython/commit/f08b2be4416163e3d18b8d09891e7cda0d… commit: f08b2be4416163e3d18b8d09891e7cda0d8a21d4 branch: 3.6 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-03T12:14:07+03:00 summary: [3.6] bpo-30978: str.format_map() now passes key lookup exceptions through. (GH-2790) (#2992) Previously any exception was replaced with a KeyError exception. (cherry picked from commit 5075416) files: A Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst M Lib/test/test_re.py M Lib/test/test_unicode.py M Objects/stringlib/unicode_format.h diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index a6cbbd0b67a..e23e5a9a6ca 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -471,7 +471,7 @@ def test_match_getitem(self): m[(0,)] with self.assertRaisesRegex(IndexError, 'no such group'): m[(0, 1)] - with self.assertRaisesRegex(KeyError, 'a2'): + with self.assertRaisesRegex(IndexError, 'no such group'): 'a1={a2}'.format_map(m) m = pat.match('ac') diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 2844bc5540c..56ab0ad7329 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1279,6 +1279,13 @@ def __format__(self, spec): self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + class BadMapping: + def __getitem__(self, key): + return 1/0 + self.assertRaises(KeyError, '{a}'.format_map, {}) + self.assertRaises(TypeError, '{a}'.format_map, []) + self.assertRaises(ZeroDivisionError, '{a}'.format_map, BadMapping()) + def test_format_huge_precision(self): format_string = ".{}f".format(sys.maxsize + 1) with self.assertRaises(ValueError): diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst new file mode 100644 index 00000000000..bb67a9fb244 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst @@ -0,0 +1,2 @@ +str.format_map() now passes key lookup exceptions through. +Previously any exception was replaced with a KeyError exception. diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index 14fa28ea54a..7314af02a4a 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -412,18 +412,22 @@ get_field_object(SubString *input, PyObject *args, PyObject *kwargs, if (index == -1) { /* look up in kwargs */ PyObject *key = SubString_new_object(&first); - if (key == NULL) + if (key == NULL) { goto error; - - /* Use PyObject_GetItem instead of PyDict_GetItem because this - code is no longer just used with kwargs. It might be passed - a non-dict when called through format_map. */ - if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) { + } + if (kwargs == NULL) { PyErr_SetObject(PyExc_KeyError, key); Py_DECREF(key); goto error; } + /* Use PyObject_GetItem instead of PyDict_GetItem because this + code is no longer just used with kwargs. It might be passed + a non-dict when called through format_map. */ + obj = PyObject_GetItem(kwargs, key); Py_DECREF(key); + if (obj == NULL) { + goto error; + } } else { /* If args is NULL, we have a format string with a positional field

1 0

Daily reference leaks (4243df51fe43): sum=-1
by solipsis＠pitrou.net 03 Aug '17

03 Aug '17

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 0, -7] memory blocks, sum=-7 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [1, 2, -1] memory blocks, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogWyi5iP', '--timeout', '7200']

1 0

bpo-30978: str.format_map() now passes key lookup exceptions through. (#2790)
by Serhiy Storchaka 03 Aug '17

03 Aug '17

https://github.com/python/cpython/commit/5075416b8fedc5526b643dabc915f7945f… commit: 5075416b8fedc5526b643dabc915f7945fa0d969 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-03T11:45:23+03:00 summary: bpo-30978: str.format_map() now passes key lookup exceptions through. (#2790) Previously any exception was replaced with a KeyError exception. files: A Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst M Lib/test/test_re.py M Lib/test/test_unicode.py M Objects/stringlib/unicode_format.h diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 0ea5a204696..e9c07a04f57 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -468,7 +468,7 @@ def test_match_getitem(self): m[(0,)] with self.assertRaisesRegex(IndexError, 'no such group'): m[(0, 1)] - with self.assertRaisesRegex(KeyError, 'a2'): + with self.assertRaisesRegex(IndexError, 'no such group'): 'a1={a2}'.format_map(m) m = pat.match('ac') diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 506f0715c2e..341007b6507 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1278,6 +1278,13 @@ def __format__(self, spec): self.assertRaises(ValueError, '{}'.format_map, 'a') self.assertRaises(ValueError, '{a} {}'.format_map, {"a" : 2, "b" : 1}) + class BadMapping: + def __getitem__(self, key): + return 1/0 + self.assertRaises(KeyError, '{a}'.format_map, {}) + self.assertRaises(TypeError, '{a}'.format_map, []) + self.assertRaises(ZeroDivisionError, '{a}'.format_map, BadMapping()) + def test_format_huge_precision(self): format_string = ".{}f".format(sys.maxsize + 1) with self.assertRaises(ValueError): diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst new file mode 100644 index 00000000000..bb67a9fb244 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-21-07-39-05.bpo-30978.f0jODc.rst @@ -0,0 +1,2 @@ +str.format_map() now passes key lookup exceptions through. +Previously any exception was replaced with a KeyError exception. diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index 7ac0d75166b..baaac811a56 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -410,18 +410,22 @@ get_field_object(SubString *input, PyObject *args, PyObject *kwargs, if (index == -1) { /* look up in kwargs */ PyObject *key = SubString_new_object(&first); - if (key == NULL) + if (key == NULL) { goto error; - - /* Use PyObject_GetItem instead of PyDict_GetItem because this - code is no longer just used with kwargs. It might be passed - a non-dict when called through format_map. */ - if ((kwargs == NULL) || (obj = PyObject_GetItem(kwargs, key)) == NULL) { + } + if (kwargs == NULL) { PyErr_SetObject(PyExc_KeyError, key); Py_DECREF(key); goto error; } + /* Use PyObject_GetItem instead of PyDict_GetItem because this + code is no longer just used with kwargs. It might be passed + a non-dict when called through format_map. */ + obj = PyObject_GetItem(kwargs, key); Py_DECREF(key); + if (obj == NULL) { + goto error; + } } else { /* If args is NULL, we have a format string with a positional field

1 0

bpo-31071: Avoid masking original TypeError in call with * unpacking (#2957)
by Serhiy Storchaka 03 Aug '17

03 Aug '17

https://github.com/python/cpython/commit/25e4f779d7ae9f37a1933cb5cbfad06e67… commit: 25e4f779d7ae9f37a1933cb5cbfad06e673c01f9 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-08-03T11:37:15+03:00 summary: bpo-31071: Avoid masking original TypeError in call with * unpacking (#2957) when other arguments are passed. files: A Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst M Lib/test/test_extcall.py M Python/ceval.c diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index 043df013112..2c1848337b2 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -163,6 +163,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *(broken() for i in range(1))) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenIterable1: ... def __iter__(self): @@ -172,6 +176,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenIterable1()) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenIterable2: ... def __iter__(self): @@ -182,6 +190,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenIterable2()) + Traceback (most recent call last): + ... + TypeError: myerror >>> class BrokenSequence: ... def __getitem__(self, idx): @@ -191,6 +203,10 @@ Traceback (most recent call last): ... TypeError: myerror + >>> g(*range(1), *BrokenSequence()) + Traceback (most recent call last): + ... + TypeError: myerror Make sure that the function doesn't stomp the dictionary diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst new file mode 100644 index 00000000000..c34d4751bfa --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-07-31-13-28-53.bpo-31071.P9UBDy.rst @@ -0,0 +1,2 @@ +Avoid masking original TypeError in call with * unpacking when other +arguments are passed. diff --git a/Python/ceval.c b/Python/ceval.c index be5cda58cda..9f732f56ba8 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -66,6 +66,8 @@ static void format_exc_unbound(PyCodeObject *co, int oparg); static PyObject * unicode_concatenate(PyObject *, PyObject *, PyFrameObject *, const _Py_CODEUNIT *); static PyObject * special_lookup(PyObject *, _Py_Identifier *); +static int check_args_iterable(PyObject *func, PyObject *vararg); +static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" @@ -2512,14 +2514,9 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) none_val = _PyList_Extend((PyListObject *)sum, PEEK(i)); if (none_val == NULL) { if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL && - PyErr_ExceptionMatches(PyExc_TypeError)) { - PyObject *func = PEEK(1 + oparg); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after * " - "must be an iterable, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - PEEK(i)->ob_type->tp_name); + PyErr_ExceptionMatches(PyExc_TypeError)) + { + check_args_iterable(PEEK(1 + oparg), PEEK(i)); } Py_DECREF(sum); goto error; @@ -2732,12 +2729,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) if (_PyDict_MergeEx(sum, arg, 2) < 0) { PyObject *func = PEEK(2 + oparg); if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - arg->ob_type->tp_name); + format_kwargs_mapping_error(func, arg); } else if (PyErr_ExceptionMatches(PyExc_KeyError)) { PyObject *exc, *val, *tb; @@ -3390,13 +3382,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) * is not a mapping. */ if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - func = SECOND(); - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after ** " - "must be a mapping, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - kwargs->ob_type->tp_name); + format_kwargs_mapping_error(SECOND(), kwargs); } Py_DECREF(kwargs); goto error; @@ -3409,14 +3395,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) callargs = POP(); func = TOP(); if (!PyTuple_CheckExact(callargs)) { - if (Py_TYPE(callargs)->tp_iter == NULL && - !PySequence_Check(callargs)) { - PyErr_Format(PyExc_TypeError, - "%.200s%.200s argument after * " - "must be an iterable, not %.200s", - PyEval_GetFuncName(func), - PyEval_GetFuncDesc(func), - callargs->ob_type->tp_name); + if (check_args_iterable(func, callargs) < 0) { Py_DECREF(callargs); goto error; } @@ -5179,6 +5158,32 @@ import_all_from(PyObject *locals, PyObject *v) return err; } +static int +check_args_iterable(PyObject *func, PyObject *args) +{ + if (args->ob_type->tp_iter == NULL && !PySequence_Check(args)) { + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after * " + "must be an iterable, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + args->ob_type->tp_name); + return -1; + } + return 0; +} + +static void +format_kwargs_mapping_error(PyObject *func, PyObject *kwargs) +{ + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after ** " + "must be a mapping, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + kwargs->ob_type->tp_name); +} + static void format_exc_check_arg(PyObject *exc, const char *format_str, PyObject *obj) {

1 0

Spelling fixes (#2902)
by Serhiy Storchaka 02 Aug '17

02 Aug '17

https://github.com/python/cpython/commit/49b2734bf12dc1cda80fd73d3ec8896ae3… commit: 49b2734bf12dc1cda80fd73d3ec8896ae3e362f2 branch: master author: Ville Skyttä <ville.skytta(a)iki.fi> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-03T09:00:59+03:00 summary: Spelling fixes (#2902) files: M Doc/library/sys.rst M Include/abstract.h M Include/unicodeobject.h M Lib/enum.py M Lib/idlelib/configdialog.py M Lib/test/decimaltestdata/ddDivide.decTest M Lib/test/decimaltestdata/ddDivideInt.decTest M Lib/test/decimaltestdata/ddFMA.decTest M Lib/test/decimaltestdata/ddMultiply.decTest M Lib/test/decimaltestdata/divide.decTest M Lib/test/decimaltestdata/dqDivide.decTest M Lib/test/decimaltestdata/dqDivideInt.decTest M Lib/test/decimaltestdata/dqFMA.decTest M Lib/test/decimaltestdata/dqMultiply.decTest M Lib/test/decimaltestdata/fma.decTest M Lib/test/decimaltestdata/multiply.decTest M Lib/test/test_binop.py M Lib/test/test_functools.py M Lib/test/test_importlib/import_/test___package__.py M Lib/test/test_os.py M Lib/test/test_subprocess.py M Lib/test/test_warnings/__init__.py M Lib/unittest/test/testmock/testmagicmethods.py M Misc/HISTORY M Misc/NEWS M Modules/_ctypes/_ctypes.c M Modules/_lzmamodule.c M Modules/posixmodule.c M Python/ceval.c diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 54b99e0fd99..8b94929c500 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -610,7 +610,7 @@ always available. :class:`~collections.namedtuple` of the form `(firstiter, finalizer)`, where *firstiter* and *finalizer* are expected to be either ``None`` or functions which take an :term:`asynchronous generator iterator` as an - argument, and are used to schedule finalization of an asychronous + argument, and are used to schedule finalization of an asynchronous generator by an event loop. .. versionadded:: 3.6 diff --git a/Include/abstract.h b/Include/abstract.h index fe089dcbb56..8969019e30c 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -170,7 +170,7 @@ PyAPI_FUNC(PyObject*) _PyStack_AsTupleSlice( format to a Python dictionary ("kwargs" dict). The type of kwnames keys is not checked. The final function getting - arguments is reponsible to check if all keys are strings, for example using + arguments is responsible to check if all keys are strings, for example using PyArg_ParseTupleAndKeywords() or PyArg_ValidateKeywordArguments(). Duplicate keys are merged using the last value. If duplicate keys must raise diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index bb91568cb4e..5ca1f87013f 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1227,7 +1227,7 @@ PyAPI_FUNC(PyObject*) PyUnicode_Encode( /* Encodes a Unicode object and returns the result as Python object. - This API is DEPRECATED. It is superceeded by PyUnicode_AsEncodedString() + This API is DEPRECATED. It is superseded by PyUnicode_AsEncodedString() since all standard encodings (except rot13) encode str to bytes. Use PyCodec_Encode() for encoding with rot13 and non-standard codecs that encode form str to non-bytes. */ diff --git a/Lib/enum.py b/Lib/enum.py index 73dd613887d..6d90f7dd65f 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -840,7 +840,7 @@ def _decompose(flag, value): not_covered = value negative = value < 0 # issue29167: wrap accesses to _value2member_map_ in a list to avoid race - # conditions between iterating over it and having more psuedo- + # conditions between iterating over it and having more pseudo- # members added to it if negative: # only check for named flags diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py index 6d8a03b1c00..f7a6b7367e4 100644 --- a/Lib/idlelib/configdialog.py +++ b/Lib/idlelib/configdialog.py @@ -1216,7 +1216,7 @@ def create_page_extensions(self): which are boolean, and can be toggled with a True/False button. Methods: - load_extentions: + load_extensions: extension_selected: Handle selection from list. create_extension_frame: Hold widgets for one extension. set_extension_value: Set in userCfg['extensions']. diff --git a/Lib/test/decimaltestdata/ddDivide.decTest b/Lib/test/decimaltestdata/ddDivide.decTest index 5531d0e0315..5b2651b2b66 100644 --- a/Lib/test/decimaltestdata/ddDivide.decTest +++ b/Lib/test/decimaltestdata/ddDivide.decTest @@ -579,7 +579,7 @@ dddiv1056 divide 1e-277 -1e+311 -> -0E-398 Underflow Subnormal Inexact Rounded dddiv1057 divide -1e-277 1e+311 -> -0E-398 Underflow Subnormal Inexact Rounded Clamped dddiv1058 divide -1e-277 -1e+311 -> 0E-398 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dddiv1060 divide 1e-291 1e+101 -> 1E-392 Subnormal dddiv1061 divide 1e-291 1e+102 -> 1E-393 Subnormal dddiv1062 divide 1e-291 1e+103 -> 1E-394 Subnormal diff --git a/Lib/test/decimaltestdata/ddDivideInt.decTest b/Lib/test/decimaltestdata/ddDivideInt.decTest index 1555b4217dc..342d13041b1 100644 --- a/Lib/test/decimaltestdata/ddDivideInt.decTest +++ b/Lib/test/decimaltestdata/ddDivideInt.decTest @@ -248,7 +248,7 @@ dddvi1056 divideint 1e-277 -1e+311 -> -0 dddvi1057 divideint -1e-277 1e+311 -> -0 dddvi1058 divideint -1e-277 -1e+311 -> 0 --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dddvi1060 divideint 1e-291 1e+101 -> 0 dddvi1061 divideint 1e-291 1e+102 -> 0 dddvi1062 divideint 1e-291 1e+103 -> 0 diff --git a/Lib/test/decimaltestdata/ddFMA.decTest b/Lib/test/decimaltestdata/ddFMA.decTest index f0acfc74d53..9094fc015bd 100644 --- a/Lib/test/decimaltestdata/ddFMA.decTest +++ b/Lib/test/decimaltestdata/ddFMA.decTest @@ -26,7 +26,7 @@ extended: 1 clamp: 1 rounding: half_even --- These tests comprese three parts: +-- These tests comprise three parts: -- 1. Sanity checks and other three-operand tests (especially those -- where the fused operation makes a difference) -- 2. Multiply tests (third operand is neutral zero [0E+emax]) @@ -458,7 +458,7 @@ ddfma2756 fma 1e-277 -1e-311 0e+384 -> -0E-398 Underflow Subnormal Inexact ddfma2757 fma -1e-277 1e-311 0e+384 -> -0E-398 Underflow Subnormal Inexact Rounded Clamped ddfma2758 fma -1e-277 -1e-311 0e+384 -> 0E-398 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) ddfma2760 fma 1e-291 1e-101 0e+384 -> 1E-392 Subnormal ddfma2761 fma 1e-291 1e-102 0e+384 -> 1E-393 Subnormal ddfma2762 fma 1e-291 1e-103 0e+384 -> 1E-394 Subnormal diff --git a/Lib/test/decimaltestdata/ddMultiply.decTest b/Lib/test/decimaltestdata/ddMultiply.decTest index 45a381dc619..b7342ac2fe7 100644 --- a/Lib/test/decimaltestdata/ddMultiply.decTest +++ b/Lib/test/decimaltestdata/ddMultiply.decTest @@ -347,7 +347,7 @@ ddmul756 multiply 1e-277 -1e-311 -> -0E-398 Underflow Subnormal Inexact Rounded ddmul757 multiply -1e-277 1e-311 -> -0E-398 Underflow Subnormal Inexact Rounded Clamped ddmul758 multiply -1e-277 -1e-311 -> 0E-398 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) ddmul760 multiply 1e-291 1e-101 -> 1E-392 Subnormal ddmul761 multiply 1e-291 1e-102 -> 1E-393 Subnormal ddmul762 multiply 1e-291 1e-103 -> 1E-394 Subnormal diff --git a/Lib/test/decimaltestdata/divide.decTest b/Lib/test/decimaltestdata/divide.decTest index efbb5baf855..a51aa5d935e 100644 --- a/Lib/test/decimaltestdata/divide.decTest +++ b/Lib/test/decimaltestdata/divide.decTest @@ -759,7 +759,7 @@ divx959 divide 9E-999999999 -9.100 -> -9.8901099E-1000000000 Inexact Rounded Und -- overflow and underflow (additional edge tests in multiply.decTest) -- 'subnormal' results now possible (all hard underflow or overflow in --- base arithemtic) +-- base arithmetic) divx960 divide 1e-600000000 1e+400000001 -> 1E-1000000001 Subnormal divx961 divide 1e-600000000 1e+400000002 -> 1E-1000000002 Subnormal divx962 divide 1e-600000000 1e+400000003 -> 1E-1000000003 Subnormal diff --git a/Lib/test/decimaltestdata/dqDivide.decTest b/Lib/test/decimaltestdata/dqDivide.decTest index 3cf60c60241..1d623ff4123 100644 --- a/Lib/test/decimaltestdata/dqDivide.decTest +++ b/Lib/test/decimaltestdata/dqDivide.decTest @@ -580,7 +580,7 @@ dqdiv1756 divide 1e-4277 -1e+3311 -> -0E-6176 Underflow Subnormal Inexact Round dqdiv1757 divide -1e-4277 1e+3311 -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped dqdiv1758 divide -1e-4277 -1e+3311 -> 0E-6176 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dqdiv1760 divide 1e-6069 1e+101 -> 1E-6170 Subnormal dqdiv1761 divide 1e-6069 1e+102 -> 1E-6171 Subnormal dqdiv1762 divide 1e-6069 1e+103 -> 1E-6172 Subnormal diff --git a/Lib/test/decimaltestdata/dqDivideInt.decTest b/Lib/test/decimaltestdata/dqDivideInt.decTest index 3fec6dbaa37..ed74fe61386 100644 --- a/Lib/test/decimaltestdata/dqDivideInt.decTest +++ b/Lib/test/decimaltestdata/dqDivideInt.decTest @@ -249,7 +249,7 @@ dqdvi1056 divideint 1e-277 -1e+311 -> -0 dqdvi1057 divideint -1e-277 1e+311 -> -0 dqdvi1058 divideint -1e-277 -1e+311 -> 0 --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dqdvi1060 divideint 1e-291 1e+101 -> 0 dqdvi1061 divideint 1e-291 1e+102 -> 0 dqdvi1062 divideint 1e-291 1e+103 -> 0 diff --git a/Lib/test/decimaltestdata/dqFMA.decTest b/Lib/test/decimaltestdata/dqFMA.decTest index 2353f2fa2cb..caa24025a75 100644 --- a/Lib/test/decimaltestdata/dqFMA.decTest +++ b/Lib/test/decimaltestdata/dqFMA.decTest @@ -26,7 +26,7 @@ maxExponent: 6144 minExponent: -6143 rounding: half_even --- These tests comprese three parts: +-- These tests comprise three parts: -- 1. Sanity checks and other three-operand tests (especially those -- where the fused operation makes a difference) -- 2. Multiply tests (third operand is neutral zero [0E+emax]) @@ -476,7 +476,7 @@ dqfma2756 fma 1e-4277 -1e-3311 0e+6144 -> -0E-6176 Underflow Subnormal Inex dqfma2757 fma -1e-4277 1e-3311 0e+6144 -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped dqfma2758 fma -1e-4277 -1e-3311 0e+6144 -> 0E-6176 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dqfma2760 fma 1e-6069 1e-101 0e+6144 -> 1E-6170 Subnormal dqfma2761 fma 1e-6069 1e-102 0e+6144 -> 1E-6171 Subnormal dqfma2762 fma 1e-6069 1e-103 0e+6144 -> 1E-6172 Subnormal diff --git a/Lib/test/decimaltestdata/dqMultiply.decTest b/Lib/test/decimaltestdata/dqMultiply.decTest index 676c1f5ea44..f9df480bb2a 100644 --- a/Lib/test/decimaltestdata/dqMultiply.decTest +++ b/Lib/test/decimaltestdata/dqMultiply.decTest @@ -355,7 +355,7 @@ dqmul756 multiply 1e-4277 -1e-3311 -> -0E-6176 Underflow Subnormal Inexact Roun dqmul757 multiply -1e-4277 1e-3311 -> -0E-6176 Underflow Subnormal Inexact Rounded Clamped dqmul758 multiply -1e-4277 -1e-3311 -> 0E-6176 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) dqmul760 multiply 1e-6069 1e-101 -> 1E-6170 Subnormal dqmul761 multiply 1e-6069 1e-102 -> 1E-6171 Subnormal dqmul762 multiply 1e-6069 1e-103 -> 1E-6172 Subnormal diff --git a/Lib/test/decimaltestdata/fma.decTest b/Lib/test/decimaltestdata/fma.decTest index 0b188fa4c30..46672af3928 100644 --- a/Lib/test/decimaltestdata/fma.decTest +++ b/Lib/test/decimaltestdata/fma.decTest @@ -25,7 +25,7 @@ rounding: half_up maxExponent: 384 minexponent: -383 --- These tests comprese three parts: +-- These tests comprise three parts: -- 1. Sanity checks and other three-operand tests (especially those -- where the fused operation makes a difference) -- 2. Multiply tests (third operand is neutral zero [0E+emax]) @@ -610,7 +610,7 @@ fmax2756 fma 1e-777777 -1e-411111 0E+999999 -> -0E-1000007 Underflow Subnorma fmax2757 fma -1e-777777 1e-411111 0E+999999 -> -0E-1000007 Underflow Subnormal Inexact Rounded Clamped fmax2758 fma -1e-777777 -1e-411111 0E+999999 -> 0E-1000007 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) precision: 9 fmax2760 fma 1e-600000 1e-400001 0E+999999 -> 1E-1000001 Subnormal fmax2761 fma 1e-600000 1e-400002 0E+999999 -> 1E-1000002 Subnormal diff --git a/Lib/test/decimaltestdata/multiply.decTest b/Lib/test/decimaltestdata/multiply.decTest index e8bd77a87c3..f291538b7da 100644 --- a/Lib/test/decimaltestdata/multiply.decTest +++ b/Lib/test/decimaltestdata/multiply.decTest @@ -533,7 +533,7 @@ mulx756 multiply 1e-777777777 -1e-411111111 -> -0E-1000000007 Underflow Subnorm mulx757 multiply -1e-777777777 1e-411111111 -> -0E-1000000007 Underflow Subnormal Inexact Rounded Clamped mulx758 multiply -1e-777777777 -1e-411111111 -> 0E-1000000007 Underflow Subnormal Inexact Rounded Clamped --- 'subnormal' boundary (all hard underflow or overflow in base arithemtic) +-- 'subnormal' boundary (all hard underflow or overflow in base arithmetic) precision: 9 mulx760 multiply 1e-600000000 1e-400000001 -> 1E-1000000001 Subnormal mulx761 multiply 1e-600000000 1e-400000002 -> 1E-1000000002 Subnormal diff --git a/Lib/test/test_binop.py b/Lib/test/test_binop.py index 4f5b8a8b93e..299af09c498 100644 --- a/Lib/test/test_binop.py +++ b/Lib/test/test_binop.py @@ -22,7 +22,7 @@ def isnum(x): return 0 def isRat(x): - """Test wheter an object is an instance of the Rat class.""" + """Test whether an object is an instance of the Rat class.""" return isinstance(x, Rat) class Rat(object): diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py index 8eede7a6849..3acfb92be4a 100644 --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1253,7 +1253,7 @@ def f(x, y): self.assertEqual(mock_int.__hash__.call_count, 2) self.assertEqual(f.cache_info(), (1, 1, 1, 1)) - # Cache eviction: No use as an argument gives no additonal call + # Cache eviction: No use as an argument gives no additional call self.assertEqual(f(6, 2), 20) self.assertEqual(mock_int.__hash__.call_count, 2) self.assertEqual(f.cache_info(), (1, 2, 1, 1)) diff --git a/Lib/test/test_importlib/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py index b26634ea453..761b256b387 100644 --- a/Lib/test/test_importlib/import_/test___package__.py +++ b/Lib/test/test_importlib/import_/test___package__.py @@ -11,7 +11,7 @@ class Using__package__: - """Use of __package__ supercedes the use of __name__/__path__ to calculate + """Use of __package__ supersedes the use of __name__/__path__ to calculate what package a module belongs to. The basic algorithm is [__package__]:: def resolve_name(name, package, level): diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 611692f7644..234f701a115 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1598,19 +1598,19 @@ def test_internal_execvpe_str(self): def test_execve_invalid_env(self): args = [sys.executable, '-c', 'pass'] - # null character in the enviroment variable name + # null character in the environment variable name newenv = os.environ.copy() newenv["FRUIT\0VEGETABLE"] = "cabbage" with self.assertRaises(ValueError): os.execve(args[0], args, newenv) - # null character in the enviroment variable value + # null character in the environment variable value newenv = os.environ.copy() newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" with self.assertRaises(ValueError): os.execve(args[0], args, newenv) - # equal character in the enviroment variable name + # equal character in the environment variable name newenv = os.environ.copy() newenv["FRUIT=ORANGE"] = "lemon" with self.assertRaises(ValueError): @@ -2430,7 +2430,7 @@ def test_spawnve_noargs(self): def _test_invalid_env(self, spawn): args = [sys.executable, '-c', 'pass'] - # null character in the enviroment variable name + # null character in the environment variable name newenv = os.environ.copy() newenv["FRUIT\0VEGETABLE"] = "cabbage" try: @@ -2440,7 +2440,7 @@ def _test_invalid_env(self, spawn): else: self.assertEqual(exitcode, 127) - # null character in the enviroment variable value + # null character in the environment variable value newenv = os.environ.copy() newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" try: @@ -2450,7 +2450,7 @@ def _test_invalid_env(self, spawn): else: self.assertEqual(exitcode, 127) - # equal character in the enviroment variable name + # equal character in the environment variable name newenv = os.environ.copy() newenv["FRUIT=ORANGE"] = "lemon" try: @@ -2460,7 +2460,7 @@ def _test_invalid_env(self, spawn): else: self.assertEqual(exitcode, 127) - # equal character in the enviroment variable value + # equal character in the environment variable value filename = support.TESTFN self.addCleanup(support.unlink, filename) with open(filename, "w") as fp: diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index a99976aa56f..d152826213e 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -668,25 +668,25 @@ def test_invalid_cmd(self): subprocess.Popen([sys.executable, "-c", "pass#\0"]) def test_invalid_env(self): - # null character in the enviroment variable name + # null character in the environment variable name newenv = os.environ.copy() newenv["FRUIT\0VEGETABLE"] = "cabbage" with self.assertRaises(ValueError): subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - # null character in the enviroment variable value + # null character in the environment variable value newenv = os.environ.copy() newenv["FRUIT"] = "orange\0VEGETABLE=cabbage" with self.assertRaises(ValueError): subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - # equal character in the enviroment variable name + # equal character in the environment variable name newenv = os.environ.copy() newenv["FRUIT=ORANGE"] = "lemon" with self.assertRaises(ValueError): subprocess.Popen([sys.executable, "-c", "pass"], env=newenv) - # equal character in the enviroment variable value + # equal character in the environment variable value newenv = os.environ.copy() newenv["FRUIT"] = "orange=lemon" with subprocess.Popen([sys.executable, "-c", diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py index 3481e9cb968..69623c40f46 100644 --- a/Lib/test/test_warnings/__init__.py +++ b/Lib/test/test_warnings/__init__.py @@ -950,7 +950,7 @@ def test_catch_warnings_defaults(self): self.assertIs(wmod.filters, orig_filters) def test_record_override_showwarning_before(self): - # Issue #28835: If warnings.showwarning() was overriden, make sure + # Issue #28835: If warnings.showwarning() was overridden, make sure # that catch_warnings(record=True) overrides it again. text = "This is a warning" wmod = self.module diff --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py index 24569b532de..7993db33893 100644 --- a/Lib/unittest/test/testmock/testmagicmethods.py +++ b/Lib/unittest/test/testmock/testmagicmethods.py @@ -255,7 +255,7 @@ def test_magicmock(self): for entry in _magics: self.assertTrue(hasattr(mock, entry)) - self.assertFalse(hasattr(mock, '__imaginery__')) + self.assertFalse(hasattr(mock, '__imaginary__')) def test_magic_mock_equality(self): diff --git a/Misc/HISTORY b/Misc/HISTORY index 4ce431f660e..4872cfce80b 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1597,7 +1597,7 @@ Library negative values the same way for keyword arguments as it does for positional arguments. -- Issue #21812: turtle.shapetransform did not tranform the turtle on the +- Issue #21812: turtle.shapetransform did not transform the turtle on the first call. (Issue identified and fixed by Lita Cho.) - Issue #21635: The difflib SequenceMatcher.get_matching_blocks() method @@ -3245,7 +3245,7 @@ Core and Builtins - Issue #19466: Clear the frames of daemon threads earlier during the Python shutdown to call objects destructors. So "unclosed file" resource - warnings are now corretly emitted for daemon threads. + warnings are now correctly emitted for daemon threads. - Issue #19514: Deduplicate some _Py_IDENTIFIER declarations. Patch by Andrei Dorian Duma. @@ -3386,7 +3386,7 @@ Library - Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID, NID, short name and long name. -- Issue #19282: dbm.open now supports the context management protocol. (Inital +- Issue #19282: dbm.open now supports the context management protocol. (Initial patch by Claudiu Popa) - Issue #8311: Added support for writing any bytes-like objects in the aifc, @@ -3481,7 +3481,7 @@ Library - Issue #19227: Remove pthread_atfork() handler. The handler was added to solve #18747 but has caused issues. -- Issue #19420: Fix reference leak in module initalization code of +- Issue #19420: Fix reference leak in module initialization code of _hashopenssl.c - Issue #19329: Optimized compiling charsets in regular expressions. @@ -4175,7 +4175,7 @@ Library - Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes inside subjectAltName correctly. Formerly the module has used OpenSSL's - GENERAL_NAME_print() function to get the string represention of ASN.1 + GENERAL_NAME_print() function to get the string representation of ASN.1 strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and ``uniformResourceIdentifier`` (URI). @@ -4268,7 +4268,7 @@ IDLE Documentation ------------- -- Issue #18743: Fix references to non-existant "StringIO" module. +- Issue #18743: Fix references to non-existent "StringIO" module. - Issue #18783: Removed existing mentions of Python long type in docstrings, error messages and comments. @@ -5022,7 +5022,7 @@ Library Thomas Barlow. - Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by - extention load_module()) now have a better chance of working when reloaded. + extension load_module()) now have a better chance of working when reloaded. - Issue #17804: New function ``struct.iter_unpack`` allows for streaming struct unpacking. @@ -5135,8 +5135,8 @@ Library error message has been removed. Patch by Ram Rachum. - Issue #18080: When building a C extension module on OS X, if the compiler - is overriden with the CC environment variable, use the new compiler as - the default for linking if LDSHARED is not also overriden. This restores + is overridden with the CC environment variable, use the new compiler as + the default for linking if LDSHARED is not also overridden. This restores Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0. - Issue #18113: Fixed a refcount leak in the curses.panel module's @@ -5207,7 +5207,7 @@ Library specifically addresses a stack misalignment issue on x86 and issues on some more recent platforms. -- Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal. +- Issue #8862: Fixed curses cleanup when getkey is interrupted by a signal. - Issue #17443: imaplib.IMAP4_stream was using the default unbuffered IO in subprocess, but the imap code assumes buffered IO. In Python2 this @@ -5382,7 +5382,7 @@ Library internal XML encoding is not UTF-8 or US-ASCII. It also now accepts bytes and strings larger than 2 GiB. -- Issue #6083: Fix multiple segmentation faults occured when PyArg_ParseTuple +- Issue #6083: Fix multiple segmentation faults occurred when PyArg_ParseTuple parses nested mutating sequence. - Issue #5289: Fix ctypes.util.find_library on Solaris. @@ -26790,7 +26790,7 @@ using sre (without changes to the re API). filecmp - supersedes the old cmp.py and dircmp.py modules. -tabnanny - check Python sources for tab-width dependance. (Moved from +tabnanny - check Python sources for tab-width dependence. (Moved from Tools/scripts/.) urllib2 - new and improved but incompatible version of urllib (still diff --git a/Misc/NEWS b/Misc/NEWS index 38449c0409f..1ef28927266 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -454,7 +454,7 @@ Library Rodola'. - bpo-30595: multiprocessing.Queue.get() with a timeout now polls its reader in - non-blocking mode if it succeeded to aquire the lock but the acquire took + non-blocking mode if it succeeded to acquire the lock but the acquire took longer than the timeout. - bpo-28556: Updates to typing module: Add generic AsyncContextManager, add @@ -892,7 +892,7 @@ Library re.sub() replacement templates regular expressions now are errors. - Issue #28835: Fix a regression introduced in warnings.catch_warnings(): - call warnings.showwarning() if it was overriden inside the context manager. + call warnings.showwarning() if it was overridden inside the context manager. - Issue #27172: To assist with upgrades from 2.7, the previously documented deprecation of ``inspect.getfullargspec()`` has been reversed. This decision @@ -1680,7 +1680,7 @@ Library again. But they still are deprecated and will be disabled in 3.7. - Issue #28835: Fix a regression introduced in warnings.catch_warnings(): - call warnings.showwarning() if it was overriden inside the context manager. + call warnings.showwarning() if it was overridden inside the context manager. - Issue #27172: To assist with upgrades from 2.7, the previously documented deprecation of ``inspect.getfullargspec()`` has been reversed. This decision diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index fc953af5184..fe39567374d 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3670,7 +3670,7 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes, */ if (ob == NULL) goto error; - /* The .from_param call that will ocurr later will pass this + /* The .from_param call that will occur later will pass this as a byref parameter. */ PyTuple_SET_ITEM(callargs, i, ob); *poutmask |= (1 << i); /* mark as out arg */ diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c index bb77552b67b..26bfa0b4ebb 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -824,7 +824,7 @@ PyDoc_STRVAR(Compressor_doc, "be FORMAT_XZ (default), FORMAT_ALONE, or FORMAT_RAW.\n" "\n" "check specifies the integrity check to use. For FORMAT_XZ, the default\n" -"is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not suport integrity\n" +"is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not support integrity\n" "checks; for these formats, check must be omitted, or be CHECK_NONE.\n" "\n" "The settings used by the compressor can be specified either as a\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 0c6723fb09f..2e5e79a8d36 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1038,7 +1038,7 @@ path_converter(PyObject *o, void *p) } else if (is_buffer) { /* XXX Replace PyObject_CheckBuffer with PyBytes_Check in other code - after removing suport of non-bytes buffer objects. */ + after removing support of non-bytes buffer objects. */ if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, "%s%s%s should be %s, not %.200s", path->function_name ? path->function_name : "", diff --git a/Python/ceval.c b/Python/ceval.c index dd90e18a855..be5cda58cda 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3313,7 +3313,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) ^- (-oparg-1) ^- (-oparg-2) - `callable` will be POPed by call_funtion. + `callable` will be POPed by call_function. NULL will will be POPed manually later. */ res = call_function(&sp, oparg, NULL);

1 0

[65 flat] Results for Python (master branch) 2017-08-02
by lp_benchmark_robot＠intel.com 02 Aug '17

02 Aug '17

Results for project python/master, build date: 2017-08-02 03:03:27-07:00. - commit: de34cbe - previous commit: 6f446be - revision date: 2017-08-02 15:31:07+09:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.106% | +0.313% | +4.655% | +8.041% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 2.081% | +0.241% | +22.334% | +13.474% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 2.009% | -0.204% | +23.003% | +12.051% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 1.147% | -0.298% | +21.541% | +11.142% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.367% | -0.969% | +7.253% | +12.763% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.507% | +0.108% | +11.657% | +11.247% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.675% | +0.235% | +7.596% | +9.920% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.785% | -0.006% | +4.386% | +5.309% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.922% | +0.282% | +8.242% | +16.473% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.376% | -0.205% | +9.864% | +11.987% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.132% | +0.117% | +3.493% | +6.498% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.948% | -0.150% | +4.575% | +7.405% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 1.112% | -0.079% | +4.424% | +4.213% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.210% | -0.100% | +9.673% | +11.192% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 2.738% | +1.593% | +7.420% | +10.183% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 1.249% | +0.146% | +6.100% | +11.250% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 1.297% | -0.054% | +10.361% | +10.632% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.352% | +0.425% | +8.444% | +9.853% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.282% | +0.292% | +4.319% | +8.553% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 1.427% | -0.144% | +3.816% | +9.007% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.438% | -0.963% | +8.962% | +12.120% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.659% | -0.185% | +47.410% | +11.134% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.323% | -0.042% | +10.346% | +13.363% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.638% | +0.216% | +18.820% | +10.936% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 7.155% | +1.142% | +4.045% | +13.494% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 1.978% | -0.936% | +3.696% | +5.994% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.545% | +0.005% | -4.212% | +5.504% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 3.197% | +0.214% | +2.093% | +7.834% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.221% | -0.079% | +0.038% | +14.917% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.842% | +0.345% | +2.576% | +21.008% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.572% | -0.116% | +3.819% | +18.041% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.912% | -0.031% | +3.929% | +20.216% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.463% | +0.570% | +12.856% | +9.739% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.228% | -0.035% | +0.194% | +9.677% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.120% | -0.043% | +9.614% | +4.250% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.090% | +0.028% | +1.386% | +4.207% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 0.895% | -0.093% | +11.262% | +11.854% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.138% | +2.352% | -5.500% | +10.197% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.248% | +0.169% | -1.685% | +12.103% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.348% | -0.374% | -0.123% | +3.039% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 0.857% | +0.231% | +10.805% | +4.854% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 0.921% | +0.401% | +8.722% | +13.159% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 1.351% | -0.169% | +1.412% | +4.534% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 2.684% | -0.889% | +26.699% | +9.936% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.908% | +0.392% | +6.176% | +3.536% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 1.245% | -0.351% | +15.882% | +7.187% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 2.041% | -0.439% | +3.160% | +1.326% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.838% | +0.039% | +6.412% | +3.044% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.062% | +0.100% | +5.458% | +8.069% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.188% | +0.153% | +5.498% | +5.050% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.218% | -1.171% | +1.912% | +9.092% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.104% | +0.271% | +13.116% | +8.182% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.622% | +0.149% | +11.038% | +6.045% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.857% | -0.632% | +12.455% | +9.362% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.481% | +0.230% | +13.935% | +9.522% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 5.782% | -1.412% | +21.701% | +12.874% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.292% | -0.329% | +6.197% | +6.677% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 1.293% | +0.451% | +0.077% | +1.619% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 8.750% | +1.278% | +9.083% | +19.383% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 2.095% | -1.051% | -3.906% | +20.727% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 3.162% | +0.351% | +6.758% | +8.277% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 0.932% | -0.193% | +5.022% | +9.252% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.082% | +0.065% | +2.439% | +6.548% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.185% | -0.136% | -5.382% | +9.957% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.686% | -0.422% | +5.796% | +9.222% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/65-flat-results-for-python-master-bra… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

Add @bitdancer as codeowner of email related stuff. (GH-2987)
by Mariatta 02 Aug '17

02 Aug '17

https://github.com/python/cpython/commit/d9d55c91bec4776b41685b48fe660621e8… commit: d9d55c91bec4776b41685b48fe660621e89f0617 branch: master author: R. David Murray <rdmurray(a)bitdance.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-08-02T15:50:50-07:00 summary: Add @bitdancer as codeowner of email related stuff. (GH-2987) files: M .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 137681b9a95..1c5164f6640 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,3 +19,10 @@ # SSL **/*ssl* @tiran + +# Email and related +**/*mail* @bitdancer +**/*smtp* @bitdancer +**/*mime* @bitdancer +**/*imap* @bitdancer +**/*poplib* @bitdancer

1 0

bpo-31080: Allowed logging.config.fileConfig() to accept both args and kwargs. (GH-2979)
by Vinay Sajip 02 Aug '17

02 Aug '17

https://github.com/python/cpython/commit/6ea56d2ebcae69257f8dd7af28c357b25b… commit: 6ea56d2ebcae69257f8dd7af28c357b25bf394c3 branch: master author: Preston Landers <planders(a)utexas.edu> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2017-08-02T21:44:28+01:00 summary: bpo-31080: Allowed logging.config.fileConfig() to accept both args and kwargs. (GH-2979) files: A Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst M Doc/library/logging.config.rst M Lib/logging/config.py M Lib/test/test_logging.py diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst index a7928a0647c..06378379c33 100644 --- a/Doc/library/logging.config.rst +++ b/Doc/library/logging.config.rst @@ -715,7 +715,12 @@ a corresponding section in the configuration file. The ``args`` entry, when :func:`eval`\ uated in the context of the ``logging`` package's namespace, is the list of arguments to the constructor for the handler class. Refer to the constructors for the relevant handlers, or to the examples -below, to see how typical entries are constructed. +below, to see how typical entries are constructed. If not provided, it defaults +to ``()``. + +The optional ``kwargs`` entry, when :func:`eval`\ uated in the context of the +``logging`` package's namespace, is the keyword argument dict to the constructor +for the handler class. If not provided, it defaults to ``{}``. .. code-block:: ini @@ -754,6 +759,7 @@ below, to see how typical entries are constructed. level=WARN formatter=form07 args=('localhost', 'from@abc', ['user1@abc', 'user2@xyz'], 'Logger Subject') + kwargs={'timeout': 10.0} [handler_hand08] class=handlers.MemoryHandler @@ -767,6 +773,7 @@ below, to see how typical entries are constructed. level=NOTSET formatter=form09 args=('localhost:9022', '/log', 'GET') + kwargs={'secure': True} Sections which specify formatter configuration are typified by the following. diff --git a/Lib/logging/config.py b/Lib/logging/config.py index d692514adfe..b3f4e28796a 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -143,9 +143,11 @@ def _install_handlers(cp, formatters): klass = eval(klass, vars(logging)) except (AttributeError, NameError): klass = _resolve(klass) - args = section["args"] + args = section.get("args", '()') args = eval(args, vars(logging)) - h = klass(*args) + kwargs = section.get("kwargs", '{}') + kwargs = eval(kwargs, vars(logging)) + h = klass(*args, **kwargs) if "level" in section: level = section["level"] h.setLevel(level) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 36ea0725153..a91cfd4ccd3 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1273,7 +1273,7 @@ class ConfigFileTest(BaseTest): datefmt= """ - # config7 adds a compiler logger. + # config7 adds a compiler logger, and uses kwargs instead of args. config7 = """ [loggers] keys=root,parser,compiler @@ -1304,7 +1304,7 @@ class ConfigFileTest(BaseTest): class=StreamHandler level=NOTSET formatter=form1 - args=(sys.stdout,) + kwargs={'stream': sys.stdout,} [formatter_form1] format=%(levelname)s ++ %(message)s diff --git a/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst b/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst new file mode 100644 index 00000000000..afa2d532c5c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst @@ -0,0 +1 @@ +Allow `logging.config.fileConfig` to accept kwargs and/or args.

1 0

Daily reference leaks (4243df51fe43): sum=-2
by solipsis＠pitrou.net 02 Aug '17

02 Aug '17

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 1, 0] memory blocks, sum=-6 test_functools leaked [0, 3, 1] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogoA48q1', '--timeout', '7200']

1 0