Mailman 3 February 2020 - Python-checkins

bpo-39572: Document ’total’ flag of TypedDict (GH-18554)
by ananthan-123 19 Feb '20

19 Feb '20

https://github.com/python/cpython/commit/ab6423fe2de0ed5f8a0dc86a9c70702293… commit: ab6423fe2de0ed5f8a0dc86a9c7070229326b0f0 branch: master author: ananthan-123 <ananthakrishnan15.2001(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T20:33:05-08:00 summary: bpo-39572: Document ’total’ flag of TypedDict (GH-18554) files: A Misc/NEWS.d/next/Documentation/2020-02-18-18-37-07.bpo-39572.CCtzy1.rst M Doc/library/typing.rst M Lib/typing.py diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index d3bab94c6dd40..eac75ee8654f5 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -996,8 +996,20 @@ The module defines the following classes, functions and decorators: Point2D = TypedDict('Point2D', x=int, y=int, label=str) Point2D = TypedDict('Point2D', {'x': int, 'y': int, 'label': str}) - See :pep:`589` for more examples and detailed rules of using ``TypedDict`` - with type checkers. + By default, all keys must be present in a TypedDict. It is possible + to override this by specifying totality. + Usage:: + + class point2D(TypedDict, total=False): + x: int + y: int + + This means that a point2D TypedDict can have any of the keys omitted.A type + checker is only expected to support a literal False or True as the value of + the total argument. True is the default, and makes all items defined in the + class body be required. + + See :pep:`589` for more examples and detailed rules of using ``TypedDict``. .. versionadded:: 3.8 diff --git a/Lib/typing.py b/Lib/typing.py index 6da145fcdb83a..0a685d304bd96 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -13,7 +13,7 @@ * Public helper functions: get_type_hints, overload, cast, no_type_check, no_type_check_decorator. * Generic aliases for collections.abc ABCs and few additional protocols. -* Special types: NewType, NamedTuple, TypedDict (may be added soon). +* Special types: NewType, NamedTuple, TypedDict. * Wrapper submodules for re and io related types. """ @@ -1885,6 +1885,19 @@ class Point2D(TypedDict): Point2D = TypedDict('Point2D', x=int, y=int, label=str) Point2D = TypedDict('Point2D', {'x': int, 'y': int, 'label': str}) + By default, all keys must be present in a TypedDict. It is possible + to override this by specifying totality. + Usage:: + + class point2D(TypedDict, total=False): + x: int + y: int + + This means that a point2D TypedDict can have any of the keys omitted.A type + checker is only expected to support a literal False or True as the value of + the total argument. True is the default, and makes all items defined in the + class body be required. + The class syntax is only supported in Python 3.6+, while two other syntax forms work for Python 2.7 and 3.2+ """ diff --git a/Misc/NEWS.d/next/Documentation/2020-02-18-18-37-07.bpo-39572.CCtzy1.rst b/Misc/NEWS.d/next/Documentation/2020-02-18-18-37-07.bpo-39572.CCtzy1.rst new file mode 100644 index 0000000000000..d47bb455e71d1 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-02-18-18-37-07.bpo-39572.CCtzy1.rst @@ -0,0 +1 @@ +Updated documentation of ``total`` flag of TypeDict.

1 0

Include subsections in TOC for PDF version of docs. (GH-9629)
by Cheryl Sabella 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/a4ba8a3983356fceb4aedabe0c33818066… commit: a4ba8a3983356fceb4aedabe0c338180666a79aa branch: master author: Cheryl Sabella <cheryl.sabella(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-02-19T00:01:15+01:00 summary: Include subsections in TOC for PDF version of docs. (GH-9629) files: A Misc/NEWS.d/next/Documentation/2018-09-28-18-13-08.bpo-9056.-sFOwU.rst M Doc/conf.py diff --git a/Doc/conf.py b/Doc/conf.py index abaa760c98c1a..32db34344a70a 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -127,6 +127,7 @@ } \let\Verbatim=\OriginalVerbatim \let\endVerbatim=\endOriginalVerbatim +\setcounter{tocdepth}{2} ''' # The paper size ('letter' or 'a4'). diff --git a/Misc/NEWS.d/next/Documentation/2018-09-28-18-13-08.bpo-9056.-sFOwU.rst b/Misc/NEWS.d/next/Documentation/2018-09-28-18-13-08.bpo-9056.-sFOwU.rst new file mode 100644 index 0000000000000..98e1c286e8613 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-09-28-18-13-08.bpo-9056.-sFOwU.rst @@ -0,0 +1 @@ +Include subsection in TOC for PDF version of docs.

1 0

bpo-39555: Fix distutils test to handle _d suffix on Windows debug build (GH-18357) (GH-18548)
by Miss Islington (bot) 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/d77e77116fa7a9fc85be1d9f417c7e9e33… commit: d77e77116fa7a9fc85be1d9f417c7e9e33fe1296 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T22:39:19+01:00 summary: bpo-39555: Fix distutils test to handle _d suffix on Windows debug build (GH-18357) (GH-18548) https://bugs.python.org/issue39555 Co-authored-by: Steve Dower <steve.dower(a)python.org> (cherry picked from commit ab0d892288f3058856a8213333e8c3e4ed8a562b) files: M Lib/distutils/tests/test_build_ext.py diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 7e3eafa8ef231..5e47e0773a964 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -312,8 +312,8 @@ def test_unicode_module_names(self): dist = Distribution({'name': 'xx', 'ext_modules': modules}) cmd = self.build_ext(dist) cmd.ensure_finalized() - self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo\..*') - self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö\..*') + self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo(_d)?\..*') + self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö(_d)?\..*') self.assertEqual(cmd.get_export_symbols(modules[0]), ['PyInit_foo']) self.assertEqual(cmd.get_export_symbols(modules[1]), ['PyInitU_f_gkaa'])

1 0

bpo-39674: Revert "bpo-25988: Do not expose abstract collection classes in the collections module. (GH-10596)" (GH-18545)
by Victor Stinner 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/af5ee3ff610377ef446c2d88bbfcbb3dff… commit: af5ee3ff610377ef446c2d88bbfcbb3dffaaf0c9 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-02-18T16:28:53+01:00 summary: bpo-39674: Revert "bpo-25988: Do not expose abstract collection classes in the collections module. (GH-10596)" (GH-18545) This reverts commit ef092fe9905f61ca27889092ca1248a11aa74498. Update collections __getattr__() and documentation to defer aliases removal to Python 3.10. files: A Misc/NEWS.d/next/Library/2020-02-18-12-31-24.bpo-39674.S_zqVM.rst M Doc/library/collections.rst M Doc/whatsnew/3.9.rst M Lib/collections/__init__.py diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index a5e8d04099b22..65cdf34aa4e4f 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -33,7 +33,7 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`, :class:`UserString` wrapper around string objects for easier string subclassing ===================== ==================================================================== -.. deprecated-removed:: 3.3 3.9 +.. deprecated-removed:: 3.3 3.10 Moved :ref:`collections-abstract-base-classes` to the :mod:`collections.abc` module. For backwards compatibility, they continue to be visible in this module through Python 3.8. diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index 23f0e4306ee63..f7e279b379f12 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -471,11 +471,6 @@ Removed since Python 3.2. (Contributed by Victor Stinner in :issue:`38916`.) -* The abstract base classes in :mod:`collections.abc` no longer are - exposed in the regular :mod:`collections` module. This will help - create a clearer distinction between the concrete classes and the abstract - base classes. - * The undocumented ``sys.callstats()`` function has been removed. Since Python 3.7, it was deprecated and always returned :const:`None`. It required a special build option ``CALL_PROFILE`` which was already removed in Python 3.7. diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index cec6c9781a15e..178cdb1fa5ba0 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -39,6 +39,21 @@ pass +def __getattr__(name): + # For backwards compatibility, continue to make the collections ABCs + # through Python 3.6 available through the collections module. + # Note, no new collections ABCs were added in Python 3.7 + if name in _collections_abc.__all__: + obj = getattr(_collections_abc, name) + import warnings + warnings.warn("Using or importing the ABCs from 'collections' instead " + "of from 'collections.abc' is deprecated since Python 3.3, " + "and in 3.10 it will stop working", + DeprecationWarning, stacklevel=2) + globals()[name] = obj + return obj + raise AttributeError(f'module {__name__!r} has no attribute {name!r}') + ################################################################################ ### OrderedDict ################################################################################ diff --git a/Misc/NEWS.d/next/Library/2020-02-18-12-31-24.bpo-39674.S_zqVM.rst b/Misc/NEWS.d/next/Library/2020-02-18-12-31-24.bpo-39674.S_zqVM.rst new file mode 100644 index 0000000000000..1d0e906242ae1 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-02-18-12-31-24.bpo-39674.S_zqVM.rst @@ -0,0 +1,4 @@ +Revert "Do not expose abstract collection classes in the collections module" +change (bpo-25988). Aliases to ABC like collections.Mapping are kept in +Python 3.9 to ease transition from Python 2.7, but will be removed in Python +3.10.

1 0

bpo-37207: Use vectorcall for range() (GH-18464)
by Petr Viktorin 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/6e35da976370e7c2e028165c65d7d7d427… commit: 6e35da976370e7c2e028165c65d7d7d42772a71f branch: master author: Petr Viktorin <encukou(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T07:13:17-08:00 summary: bpo-37207: Use vectorcall for range() (GH-18464) This continues the `range()` part of #13930. The complete pull request is stalled on discussions around dicts, but `range()` should not be controversial. (And I plan to open PRs for other parts if this is merged.) On top of Mark's change, I unified `range_new` and `range_vectorcall`, which had a lot of duplicate code. https://bugs.python.org/issue37207 files: A Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLR.rst M Objects/rangeobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLR.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLR.rst new file mode 100644 index 0000000000000..c20d48a493c34 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-09-10-54-31.bpo-37207.bLjgLR.rst @@ -0,0 +1,2 @@ +Speed up calls to ``range()`` by about 30%, by using the +PEP 590 ``vectorcall`` calling convention. Patch by Mark Shannon. diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 343a80c76b0bc..123ca0b032e0e 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -2,6 +2,7 @@ #include "Python.h" #include "structmember.h" +#include "pycore_tupleobject.h" /* Support objects whose length is > PY_SSIZE_T_MAX. @@ -71,34 +72,27 @@ make_range_object(PyTypeObject *type, PyObject *start, range(0, 5, -1) */ static PyObject * -range_new(PyTypeObject *type, PyObject *args, PyObject *kw) +range_from_array(PyTypeObject *type, PyObject *const *args, Py_ssize_t num_args) { rangeobject *obj; PyObject *start = NULL, *stop = NULL, *step = NULL; - if (!_PyArg_NoKeywords("range", kw)) - return NULL; - - Py_ssize_t num_args = PyTuple_GET_SIZE(args); switch (num_args) { case 3: - step = PyTuple_GET_ITEM(args, 2); + step = args[2]; /* fallthrough */ case 2: - start = PyTuple_GET_ITEM(args, 0); - start = PyNumber_Index(start); + /* Convert borrowed refs to owned refs */ + start = PyNumber_Index(args[0]); if (!start) { return NULL; } - - stop = PyTuple_GET_ITEM(args, 1); - stop = PyNumber_Index(stop); + stop = PyNumber_Index(args[1]); if (!stop) { Py_DECREF(start); return NULL; } - - step = validate_step(step); + step = validate_step(step); /* Caution, this can clear exceptions */ if (!step) { Py_DECREF(start); Py_DECREF(stop); @@ -106,8 +100,7 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw) } break; case 1: - stop = PyTuple_GET_ITEM(args, 0); - stop = PyNumber_Index(stop); + stop = PyNumber_Index(args[0]); if (!stop) { return NULL; } @@ -126,10 +119,10 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw) num_args); return NULL; } - obj = make_range_object(type, start, stop, step); - if (obj != NULL) + if (obj != NULL) { return (PyObject *) obj; + } /* Failed to create object, release attributes */ Py_DECREF(start); @@ -138,6 +131,28 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw) return NULL; } +static PyObject * +range_new(PyTypeObject *type, PyObject *args, PyObject *kw) +{ + if (!_PyArg_NoKeywords("range", kw)) + return NULL; + + return range_from_array(type, _PyTuple_ITEMS(args), PyTuple_GET_SIZE(args)); +} + + +static PyObject * +range_vectorcall(PyTypeObject *type, PyObject *const *args, + size_t nargsf, PyObject *kwnames) +{ + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (kwnames && PyTuple_GET_SIZE(kwnames) != 0) { + PyErr_Format(PyExc_TypeError, "range() takes no keyword arguments"); + return NULL; + } + return range_from_array(type, args, nargs); +} + PyDoc_STRVAR(range_doc, "range(stop) -> range object\n\ range(start, stop[, step]) -> range object\n\ @@ -719,6 +734,7 @@ PyTypeObject PyRange_Type = { 0, /* tp_init */ 0, /* tp_alloc */ range_new, /* tp_new */ + .tp_vectorcall = (vectorcallfunc)range_vectorcall }; /*********************** range Iterator **************************/

1 0

bpo-36347: stop using RESTRICTED constants (GH-12684)
by Jeroen Demeyer 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/24bba8cf5b8db25c19bcd1d94e8e356874… commit: 24bba8cf5b8db25c19bcd1d94e8e356874d1c723 branch: master author: Jeroen Demeyer <jeroen.k.demeyer(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T05:14:46-08:00 summary: bpo-36347: stop using RESTRICTED constants (GH-12684) The constants `RESTRICTED` and `PY_WRITE_RESTRICTED` no longer have a meaning in Python 3. Therefore, CPython should not use them. CC @matrixise https://bugs.python.org/issue36347 files: M Objects/classobject.c M Objects/funcobject.c M Objects/methodobject.c diff --git a/Objects/classobject.c b/Objects/classobject.c index 97f50fa1a1edc..999b91c0a2dc8 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -145,9 +145,9 @@ static PyMethodDef method_methods[] = { #define MO_OFF(x) offsetof(PyMethodObject, x) static PyMemberDef method_memberlist[] = { - {"__func__", T_OBJECT, MO_OFF(im_func), READONLY|RESTRICTED, + {"__func__", T_OBJECT, MO_OFF(im_func), READONLY, "the function (or other callable) implementing a method"}, - {"__self__", T_OBJECT, MO_OFF(im_self), READONLY|RESTRICTED, + {"__self__", T_OBJECT, MO_OFF(im_self), READONLY, "the instance to which a method is bound"}, {NULL} /* Sentinel */ }; @@ -400,7 +400,7 @@ PyInstanceMethod_Function(PyObject *im) #define IMO_OFF(x) offsetof(PyInstanceMethodObject, x) static PyMemberDef instancemethod_memberlist[] = { - {"__func__", T_OBJECT, IMO_OFF(func), READONLY|RESTRICTED, + {"__func__", T_OBJECT, IMO_OFF(func), READONLY, "the function (or other callable) implementing a method"}, {NULL} /* Sentinel */ }; diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 419db33602a36..3ec949d573bf5 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -239,12 +239,10 @@ PyFunction_SetAnnotations(PyObject *op, PyObject *annotations) #define OFF(x) offsetof(PyFunctionObject, x) static PyMemberDef func_memberlist[] = { - {"__closure__", T_OBJECT, OFF(func_closure), - RESTRICTED|READONLY}, - {"__doc__", T_OBJECT, OFF(func_doc), PY_WRITE_RESTRICTED}, - {"__globals__", T_OBJECT, OFF(func_globals), - RESTRICTED|READONLY}, - {"__module__", T_OBJECT, OFF(func_module), PY_WRITE_RESTRICTED}, + {"__closure__", T_OBJECT, OFF(func_closure), READONLY}, + {"__doc__", T_OBJECT, OFF(func_doc), 0}, + {"__globals__", T_OBJECT, OFF(func_globals), READONLY}, + {"__module__", T_OBJECT, OFF(func_module), 0}, {NULL} /* Sentinel */ }; diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 1d54c4cea6900..0d4570534b1ae 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -222,7 +222,7 @@ static PyGetSetDef meth_getsets [] = { #define OFF(x) offsetof(PyCFunctionObject, x) static PyMemberDef meth_members[] = { - {"__module__", T_OBJECT, OFF(m_module), PY_WRITE_RESTRICTED}, + {"__module__", T_OBJECT, OFF(m_module), 0}, {NULL} };

1 0

bpo-39432: Implement PEP-489 algorithm for non-ascii "PyInit_*" symbol names in distutils (GH-18150) (GH-18546)
by Miss Islington (bot) 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/5bf58cef151249f1cca92166d1b7069334… commit: 5bf58cef151249f1cca92166d1b70693348da9d8 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T14:14:43+01:00 summary: bpo-39432: Implement PEP-489 algorithm for non-ascii "PyInit_*" symbol names in distutils (GH-18150) (GH-18546) Make it export the correct init symbol also on Windows. https://bugs.python.org/issue39432 (cherry picked from commit 9538bc9185e934bee2bd5ae2cda2b2e92a61906d) Co-authored-by: Stefan Behnel <stefan_ml(a)behnel.de> files: A Misc/NEWS.d/next/Library/2020-01-23-16-08-58.bpo-39432.Cee6mi.rst M Lib/distutils/command/build_ext.py M Lib/distutils/tests/test_build_ext.py diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 2d7cdf063f01d..dbcd9d16f28c5 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -688,7 +688,15 @@ def get_export_symbols(self, ext): provided, "PyInit_" + module_name. Only relevant on Windows, where the .pyd file (DLL) must export the module "PyInit_" function. """ - initfunc_name = "PyInit_" + ext.name.split('.')[-1] + suffix = '_' + ext.name.split('.')[-1] + try: + # Unicode module name support as defined in PEP-489 + # https://www.python.org/dev/peps/pep-0489/#export-hook-name + suffix.encode('ascii') + except UnicodeEncodeError: + suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii') + + initfunc_name = "PyInit" + suffix if initfunc_name not in ext.export_symbols: ext.export_symbols.append(initfunc_name) return ext.export_symbols diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 52d36b2484f41..7e3eafa8ef231 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -304,6 +304,19 @@ def test_get_source_files(self): cmd.ensure_finalized() self.assertEqual(cmd.get_source_files(), ['xxx']) + def test_unicode_module_names(self): + modules = [ + Extension('foo', ['aaa'], optional=False), + Extension('föö', ['uuu'], optional=False), + ] + dist = Distribution({'name': 'xx', 'ext_modules': modules}) + cmd = self.build_ext(dist) + cmd.ensure_finalized() + self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo\..*') + self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö\..*') + self.assertEqual(cmd.get_export_symbols(modules[0]), ['PyInit_foo']) + self.assertEqual(cmd.get_export_symbols(modules[1]), ['PyInitU_f_gkaa']) + def test_compiler_option(self): # cmd.compiler is an option and # should not be overridden by a compiler instance diff --git a/Misc/NEWS.d/next/Library/2020-01-23-16-08-58.bpo-39432.Cee6mi.rst b/Misc/NEWS.d/next/Library/2020-01-23-16-08-58.bpo-39432.Cee6mi.rst new file mode 100644 index 0000000000000..21c4ba8620755 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-23-16-08-58.bpo-39432.Cee6mi.rst @@ -0,0 +1 @@ +Implement PEP-489 algorithm for non-ascii "PyInit\_..." symbol names in distutils to make it export the correct init symbol also on Windows.

1 0

(no subject)
by Łukasz Langa 18 Feb '20

18 Feb '20

To: python-checkins(a)python.org Subject: Python 3.8.2rc2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/777ba072d61f50cc39427ae87ab63eb3d3… 8542 commit: 777ba072d61f50cc39427ae87ab63eb3d3d88542 branch: 3.8 author: =C5=81ukasz Langa <lukasz(a)langa.pl> committer: =C5=81ukasz Langa <lukasz(a)langa.pl> date: 2020-02-17T23:45:14+01:00 summary: Python 3.8.2rc2 files: A Misc/NEWS.d/3.8.2rc2.rst D Misc/NEWS.d/next/Core and Builtins/2020-01-05-13-36-08.bpo-39219.uHtKd4.rst D Misc/NEWS.d/next/Core and Builtins/2020-01-25-23-51-17.bpo-39453.xCOkYk.rst D Misc/NEWS.d/next/Core and Builtins/2020-02-11-23-59-07.bpo-39606.a72Sxc.rst D Misc/NEWS.d/next/Core and Builtins/2020-02-13-07-35-00.bpo-39619.inb_master= _chroot.rst D Misc/NEWS.d/next/IDLE/2020-02-10-17-09-48.bpo-39600.X6NsyM.rst D Misc/NEWS.d/next/Library/2020-02-07-23-14-14.bpo-39595.DHwddE.rst D Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst D Misc/NEWS.d/next/Library/2020-02-12-12-01-26.bpo-39474.RZMEUH.rst D Misc/NEWS.d/next/Library/2020-02-16-07-08-54.bpo-27657.9atgcz.rst D Misc/NEWS.d/next/Security/2020-02-07-23-54-18.bpo-39184.v-ue-v.rst M Include/patchlevel.h M Lib/pydoc_data/topics.py M README.rst diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 506f43c3e0adc..fc1c0f591f8d4 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -20,10 +20,10 @@ #define PY_MINOR_VERSION 8 #define PY_MICRO_VERSION 2 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_SERIAL 2 =20 /* Version as a string */ -#define PY_VERSION "3.8.2rc1+" +#define PY_VERSION "3.8.2rc2" /*--end constants--*/ =20 /* Version as a single 4-byte hex number, e.g. 0x010502B2 =3D=3D 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index b9e741707cba5..3c1b780384570 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Mon Feb 10 19:25:27 2020 +# Autogenerated by Sphinx on Mon Feb 17 23:43:37 2020 topics =3D {'assert': 'The "assert" statement\n' '**********************\n' '\n' diff --git a/Misc/NEWS.d/3.8.2rc2.rst b/Misc/NEWS.d/3.8.2rc2.rst new file mode 100644 index 0000000000000..fed6ceadb28c5 --- /dev/null +++ b/Misc/NEWS.d/3.8.2rc2.rst @@ -0,0 +1,103 @@ +.. bpo: 39184 +.. date: 2020-02-07-23-54-18 +.. nonce: v-ue-v +.. release date: 2020-02-17 +.. section: Security + +Add audit events to functions in `fcntl`, `msvcrt`, `os`, `resource`, +`shutil`, `signal` and `syslog`. + +.. + +.. bpo: 39619 +.. date: 2020-02-13-07-35-00 +.. nonce: inb_master_chroot +.. section: Core and Builtins + +Enable use of :func:`os.chroot` on HP-UX systems. + +.. + +.. bpo: 39606 +.. date: 2020-02-11-23-59-07 +.. nonce: a72Sxc +.. section: Core and Builtins + +Fix regression caused by fix for bpo-39386, that prevented calling +``aclose`` on an async generator that had already been closed or exhausted. + +.. + +.. bpo: 39453 +.. date: 2020-01-25-23-51-17 +.. nonce: xCOkYk +.. section: Core and Builtins + +Fixed a possible crash in :meth:`list.__contains__` when a list is changed +during comparing items. Patch by Dong-hee Na. + +.. + +.. bpo: 39219 +.. date: 2020-01-05-13-36-08 +.. nonce: uHtKd4 +.. section: Core and Builtins + +Syntax errors raised in the tokenizer now always set correct "text" and +"offset" attributes. + +.. + +.. bpo: 27657 +.. date: 2020-02-16-07-08-54 +.. nonce: 9atgcz +.. section: Library + +The original fix for bpo-27657, "Fix urlparse() with numeric paths" +(GH-16839) included in 3.8.1, inadvertently introduced a behavior change +that broke several third-party packages relying on the original undefined +parsing behavior. The change is reverted in 3.8.2, restoring the behavior of +3.8.0 and earlier releases. + +.. + +.. bpo: 39474 +.. date: 2020-02-12-12-01-26 +.. nonce: RZMEUH +.. section: Library + +Fixed starting position of AST for expressions like ``(a)(b)``, ``(a)[b]`` +and ``(a).b``. + +.. + +.. bpo: 21016 +.. date: 2020-02-12-10-04-39 +.. nonce: bFXPH7 +.. section: Library + +The :mod:`pydoc` and :mod:`trace` modules now use the :mod:`sysconfig` +module to get the path to the Python standard library, to support uncommon +installation path like ``/usr/lib64/python3.9/`` on Fedora. Patch by Jan +Mat=C4=9Bjek. + +.. + +.. bpo: 39595 +.. date: 2020-02-07-23-14-14 +.. nonce: DHwddE +.. section: Library + +Improved performance of zipfile.Path for files with a large number of +entries. Also improved performance and fixed minor issue as published with +`importlib_metadata 1.5 +<https://importlib-metadata.readthedocs.io/en/latest/changelog%20(links).htm= l#v1-5-0>`_. + +.. + +.. bpo: 39600 +.. date: 2020-02-10-17-09-48 +.. nonce: X6NsyM +.. section: IDLE + +In the font configuration window, remove duplicated font names. diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-01-05-13-36-08.bpo-39219= .uHtKd4.rst b/Misc/NEWS.d/next/Core and Builtins/2020-01-05-13-36-08.bpo-3921= 9.uHtKd4.rst deleted file mode 100644 index dac8360df712c..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-01-05-13-36-08.bpo-39219.uHtKd4= .rst=09 +++ /dev/null @@ -1,2 +0,0 @@ -Syntax errors raised in the tokenizer now always set correct "text" and -"offset" attributes. diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-01-25-23-51-17.bpo-39453= .xCOkYk.rst b/Misc/NEWS.d/next/Core and Builtins/2020-01-25-23-51-17.bpo-3945= 3.xCOkYk.rst deleted file mode 100644 index 8c2e49f9474c4..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-01-25-23-51-17.bpo-39453.xCOkYk= .rst=09 +++ /dev/null @@ -1,2 +0,0 @@ -Fixed a possible crash in :meth:`list.__contains__` when a list is changed -during comparing items. Patch by Dong-hee Na. diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-02-11-23-59-07.bpo-39606= .a72Sxc.rst b/Misc/NEWS.d/next/Core and Builtins/2020-02-11-23-59-07.bpo-3960= 6.a72Sxc.rst deleted file mode 100644 index b7cbe4e91f59c..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-02-11-23-59-07.bpo-39606.a72Sxc= .rst=09 +++ /dev/null @@ -1,2 +0,0 @@ -Fix regression caused by fix for bpo-39386, that prevented calling -``aclose`` on an async generator that had already been closed or exhausted. diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-02-13-07-35-00.bpo-39619= .inb_master_chroot.rst b/Misc/NEWS.d/next/Core and Builtins/2020-02-13-07-35-= 00.bpo-39619.inb_master_chroot.rst deleted file mode 100644 index 18f32f7e804bd..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2020-02-13-07-35-00.bpo-39619.inb_ma= ster_chroot.rst=09 +++ /dev/null @@ -1 +0,0 @@ -Enable use of :func:`os.chroot` on HP-UX systems. diff --git a/Misc/NEWS.d/next/IDLE/2020-02-10-17-09-48.bpo-39600.X6NsyM.rst b= /Misc/NEWS.d/next/IDLE/2020-02-10-17-09-48.bpo-39600.X6NsyM.rst deleted file mode 100644 index 102aa75f5813e..0000000000000 --- a/Misc/NEWS.d/next/IDLE/2020-02-10-17-09-48.bpo-39600.X6NsyM.rst +++ /dev/null @@ -1 +0,0 @@ -In the font configuration window, remove duplicated font names. diff --git a/Misc/NEWS.d/next/Library/2020-02-07-23-14-14.bpo-39595.DHwddE.rs= t b/Misc/NEWS.d/next/Library/2020-02-07-23-14-14.bpo-39595.DHwddE.rst deleted file mode 100644 index 3a461389af7d1..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-02-07-23-14-14.bpo-39595.DHwddE.rst +++ /dev/null @@ -1 +0,0 @@ -Improved performance of zipfile.Path for files with a large number of entrie= s. Also improved performance and fixed minor issue as published with `importl= ib_metadata 1.5 <https://importlib-metadata.readthedocs.io/en/latest/changelo= g%20(links).html#v1-5-0>`_. diff --git a/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rs= t b/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst deleted file mode 100644 index fb91bb3825555..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-02-12-10-04-39.bpo-21016.bFXPH7.rst +++ /dev/null @@ -1,4 +0,0 @@ -The :mod:`pydoc` and :mod:`trace` modules now use the :mod:`sysconfig` -module to get the path to the Python standard library, to support uncommon -installation path like ``/usr/lib64/python3.9/`` on Fedora. -Patch by Jan Mat=C4=9Bjek. diff --git a/Misc/NEWS.d/next/Library/2020-02-12-12-01-26.bpo-39474.RZMEUH.rs= t b/Misc/NEWS.d/next/Library/2020-02-12-12-01-26.bpo-39474.RZMEUH.rst deleted file mode 100644 index e990f84a9dbf2..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-02-12-12-01-26.bpo-39474.RZMEUH.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fixed starting position of AST for expressions like ``(a)(b)``, ``(a)[b]`` -and ``(a).b``. diff --git a/Misc/NEWS.d/next/Library/2020-02-16-07-08-54.bpo-27657.9atgcz.rs= t b/Misc/NEWS.d/next/Library/2020-02-16-07-08-54.bpo-27657.9atgcz.rst deleted file mode 100644 index 50bf8b28217b1..0000000000000 --- a/Misc/NEWS.d/next/Library/2020-02-16-07-08-54.bpo-27657.9atgcz.rst +++ /dev/null @@ -1,5 +0,0 @@ -The original fix for bpo-27657, "Fix urlparse() with numeric paths" (GH-1683= 9) -included in 3.8.1, inadvertently introduced a behavior change that broke -several third-party packages relying on the original undefined parsing -behavior. The change is reverted in 3.8.2, restoring the behavior of 3.8.0 a= nd -earlier releases. diff --git a/Misc/NEWS.d/next/Security/2020-02-07-23-54-18.bpo-39184.v-ue-v.r= st b/Misc/NEWS.d/next/Security/2020-02-07-23-54-18.bpo-39184.v-ue-v.rst deleted file mode 100644 index cf25c24d58788..0000000000000 --- a/Misc/NEWS.d/next/Security/2020-02-07-23-54-18.bpo-39184.v-ue-v.rst +++ /dev/null @@ -1 +0,0 @@ -Add audit events to functions in `fcntl`, `msvcrt`, `os`, `resource`, `shuti= l`, `signal` and `syslog`. \ No newline at end of file diff --git a/README.rst b/README.rst index 0b4695ce0e509..5858120b42929 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -This is Python version 3.8.2rc1 +This is Python version 3.8.2rc2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =20 .. image:: https://travis-ci.org/python/cpython.svg?branch=3D3.8

1 0

bpo-1635741: Port _bz2 extension module to multiphase initialization(PEP 489) (GH-18050)
by Hai Shi 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/5d38517aa1836542a5417b724c093bcb24… commit: 5d38517aa1836542a5417b724c093bcb245f0f47 branch: master author: Hai Shi <shihai1992(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T03:17:38-08:00 summary: bpo-1635741: Port _bz2 extension module to multiphase initialization(PEP 489) (GH-18050) https://bugs.python.org/issue1635741 files: A Misc/NEWS.d/next/Core and Builtins/2020-01-18-11-06-28.bpo-1635741.OKROOt.rst M Modules/_bz2module.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-01-18-11-06-28.bpo-1635741.OKROOt.rst b/Misc/NEWS.d/next/Core and Builtins/2020-01-18-11-06-28.bpo-1635741.OKROOt.rst new file mode 100644 index 0000000000000..d3f12a747963a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-01-18-11-06-28.bpo-1635741.OKROOt.rst @@ -0,0 +1 @@ +Port _bz2 extension module to multiphase initialization (:pep:`489`). \ No newline at end of file diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c index 31bbf66104119..fe5880989873e 100644 --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -728,13 +728,45 @@ static PyTypeObject BZ2Decompressor_Type = { /* Module initialization. */ +static int +_bz2_exec(PyObject *module) +{ + if (PyType_Ready(&BZ2Compressor_Type) < 0) { + return -1; + } + if (PyType_Ready(&BZ2Decompressor_Type) < 0) { + return -1; + } + + Py_INCREF(&BZ2Compressor_Type); + if (PyModule_AddObject(module, "BZ2Compressor", + (PyObject *)&BZ2Compressor_Type) < 0) { + Py_DECREF(&BZ2Compressor_Type); + return -1; + } + + Py_INCREF(&BZ2Decompressor_Type); + if (PyModule_AddObject(module, "BZ2Decompressor", + (PyObject *)&BZ2Decompressor_Type) < 0) { + Py_INCREF(&BZ2Decompressor_Type); + return -1; + } + + return 0; +} + +static struct PyModuleDef_Slot _bz2_slots[] = { + {Py_mod_exec, _bz2_exec}, + {0, NULL} +}; + static struct PyModuleDef _bz2module = { PyModuleDef_HEAD_INIT, "_bz2", NULL, - -1, - NULL, + 0, NULL, + _bz2_slots, NULL, NULL, NULL @@ -743,23 +775,5 @@ static struct PyModuleDef _bz2module = { PyMODINIT_FUNC PyInit__bz2(void) { - PyObject *m; - - if (PyType_Ready(&BZ2Compressor_Type) < 0) - return NULL; - if (PyType_Ready(&BZ2Decompressor_Type) < 0) - return NULL; - - m = PyModule_Create(&_bz2module); - if (m == NULL) - return NULL; - - Py_INCREF(&BZ2Compressor_Type); - PyModule_AddObject(m, "BZ2Compressor", (PyObject *)&BZ2Compressor_Type); - - Py_INCREF(&BZ2Decompressor_Type); - PyModule_AddObject(m, "BZ2Decompressor", - (PyObject *)&BZ2Decompressor_Type); - - return m; + return PyModuleDef_Init(&_bz2module); }

1 0

[3.8] bpo-39546: argparse: Honor allow_abbrev=False for specified prefix_chars (GH-18337) (GH-18543)
by Miss Islington (bot) 18 Feb '20

18 Feb '20

https://github.com/python/cpython/commit/e412cbba52e7cf6699720d99a4b88baef9… commit: e412cbba52e7cf6699720d99a4b88baef92db7b2 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-02-18T03:14:07-08:00 summary: [3.8] bpo-39546: argparse: Honor allow_abbrev=False for specified prefix_chars (GH-18337) (GH-18543) When `allow_abbrev` was first added, disabling the abbreviation of long options broke the grouping of short flags ([bpo-26967](https://bugs.python.org/issue26967)). As a fix, b1e4d1b603 (contained in v3.8) ignores `allow_abbrev=False` for a given argument string if the string does _not_ start with "--" (i.e. it doesn't look like a long option). This fix, however, doesn't take into account that long options can start with alternative characters specified via `prefix_chars`, introducing a regression: `allow_abbrev=False` has no effect on long options that start with an alternative prefix character. The most minimal fix would be to replace the "starts with --" check with a "starts with two prefix_chars characters". But `_get_option_tuples` already distinguishes between long and short options, so let's instead piggyback off of that check by moving the `allow_abbrev` condition into `_get_option_tuples`. https://bugs.python.org/issue39546 (cherry picked from commit 8edfc47baec7ff4cb1b9db83dd35c8ffc1d498a4) Co-authored-by: Kyle Meyer <kyle(a)kyleam.com> https://bugs.python.org/issue39546 Automerge-Triggered-By: @encukou files: A Misc/NEWS.d/next/Library/2020-02-03-15-12-51.bpo-39546._Kj0Pn.rst M Lib/argparse.py M Lib/test/test_argparse.py M Misc/ACKS diff --git a/Lib/argparse.py b/Lib/argparse.py index fd61bc78c2c3d..2dad5f123f390 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -2144,24 +2144,23 @@ def _parse_optional(self, arg_string): action = self._option_string_actions[option_string] return action, option_string, explicit_arg - if self.allow_abbrev or not arg_string.startswith('--'): - # search through all possible prefixes of the option string - # and all actions in the parser for possible interpretations - option_tuples = self._get_option_tuples(arg_string) - - # if multiple actions match, the option string was ambiguous - if len(option_tuples) > 1: - options = ', '.join([option_string - for action, option_string, explicit_arg in option_tuples]) - args = {'option': arg_string, 'matches': options} - msg = _('ambiguous option: %(option)s could match %(matches)s') - self.error(msg % args) - - # if exactly one action matched, this segmentation is good, - # so return the parsed action - elif len(option_tuples) == 1: - option_tuple, = option_tuples - return option_tuple + # search through all possible prefixes of the option string + # and all actions in the parser for possible interpretations + option_tuples = self._get_option_tuples(arg_string) + + # if multiple actions match, the option string was ambiguous + if len(option_tuples) > 1: + options = ', '.join([option_string + for action, option_string, explicit_arg in option_tuples]) + args = {'option': arg_string, 'matches': options} + msg = _('ambiguous option: %(option)s could match %(matches)s') + self.error(msg % args) + + # if exactly one action matched, this segmentation is good, + # so return the parsed action + elif len(option_tuples) == 1: + option_tuple, = option_tuples + return option_tuple # if it was not found as an option, but it looks like a negative # number, it was meant to be positional @@ -2185,16 +2184,17 @@ def _get_option_tuples(self, option_string): # split at the '=' chars = self.prefix_chars if option_string[0] in chars and option_string[1] in chars: - if '=' in option_string: - option_prefix, explicit_arg = option_string.split('=', 1) - else: - option_prefix = option_string - explicit_arg = None - for option_string in self._option_string_actions: - if option_string.startswith(option_prefix): - action = self._option_string_actions[option_string] - tup = action, option_string, explicit_arg - result.append(tup) + if self.allow_abbrev: + if '=' in option_string: + option_prefix, explicit_arg = option_string.split('=', 1) + else: + option_prefix = option_string + explicit_arg = None + for option_string in self._option_string_actions: + if option_string.startswith(option_prefix): + action = self._option_string_actions[option_string] + tup = action, option_string, explicit_arg + result.append(tup) # single character options can be concatenated with their arguments # but multiple character options always have to have their argument diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 86ec6cca51acc..0753a4b59652d 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -786,6 +786,23 @@ class TestOptionalsDisallowLongAbbreviation(ParserTestCase): ] +class TestOptionalsDisallowLongAbbreviationPrefixChars(ParserTestCase): + """Disallowing abbreviations works with alternative prefix characters""" + + parser_signature = Sig(prefix_chars='+', allow_abbrev=False) + argument_signatures = [ + Sig('++foo'), + Sig('++foodle', action='store_true'), + Sig('++foonly'), + ] + failures = ['+foon 3', '++foon 3', '++food', '++food ++foo 2'] + successes = [ + ('', NS(foo=None, foodle=False, foonly=None)), + ('++foo 3', NS(foo='3', foodle=False, foonly=None)), + ('++foonly 7 ++foodle ++foo 2', NS(foo='2', foodle=True, foonly='7')), + ] + + class TestDisallowLongAbbreviationAllowsShortGrouping(ParserTestCase): """Do not allow abbreviations of long options at all""" @@ -804,6 +821,26 @@ class TestDisallowLongAbbreviationAllowsShortGrouping(ParserTestCase): ('-ccrcc', NS(r='cc', c=2)), ] + +class TestDisallowLongAbbreviationAllowsShortGroupingPrefix(ParserTestCase): + """Short option grouping works with custom prefix and allow_abbrev=False""" + + parser_signature = Sig(prefix_chars='+', allow_abbrev=False) + argument_signatures = [ + Sig('+r'), + Sig('+c', action='count'), + ] + failures = ['+r', '+c +r'] + successes = [ + ('', NS(r=None, c=None)), + ('+ra', NS(r='a', c=None)), + ('+rcc', NS(r='cc', c=None)), + ('+cc', NS(r=None, c=2)), + ('+cc +ra', NS(r='a', c=2)), + ('+ccrcc', NS(r='cc', c=2)), + ] + + # ================ # Positional tests # ================ diff --git a/Misc/ACKS b/Misc/ACKS index 21ee85b4558ed..69ed251b988db 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1096,6 +1096,7 @@ Brian Merrell Alexis Métaireau Luke Mewburn Carl Meyer +Kyle Meyer Mike Meyer Piotr Meyer Steven Miale diff --git a/Misc/NEWS.d/next/Library/2020-02-03-15-12-51.bpo-39546._Kj0Pn.rst b/Misc/NEWS.d/next/Library/2020-02-03-15-12-51.bpo-39546._Kj0Pn.rst new file mode 100644 index 0000000000000..8f035e79963e0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-02-03-15-12-51.bpo-39546._Kj0Pn.rst @@ -0,0 +1,3 @@ +Fix a regression in :class:`~argparse.ArgumentParser` where +``allow_abbrev=False`` was ignored for long options that used a prefix +character other than "-".

1 0