Mailman 3 July 2021 - Python-checkins

bpo-44490: Add __parameters__ and __getitem__ to types.Union (GH-26980)
by gvanrossum 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/c45fa1a5d9b419cf13ad4b5a7cb4539564… commit: c45fa1a5d9b419cf13ad4b5a7cb453956495b83e branch: main author: Yurii Karabas <1998uriyyo(a)gmail.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-07-06T11:04:33-07:00 summary: bpo-44490: Add __parameters__ and __getitem__ to types.Union (GH-26980) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> Co-authored-by: Guido van Rossum <gvanrossum(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst M Include/genericaliasobject.h M Lib/test/test_types.py M Objects/genericaliasobject.c M Objects/unionobject.c diff --git a/Include/genericaliasobject.h b/Include/genericaliasobject.h index cf002976b27cd..4ce9244bb4ce7 100644 --- a/Include/genericaliasobject.h +++ b/Include/genericaliasobject.h @@ -5,6 +5,11 @@ extern "C" { #endif +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _Py_subs_parameters(PyObject *, PyObject *, PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) _Py_make_parameters(PyObject *); +#endif + PyAPI_FUNC(PyObject *) Py_GenericAlias(PyObject *, PyObject *); PyAPI_DATA(PyTypeObject) Py_GenericAliasType; diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index ae7b17bd590e6..7f7ce86ff08ef 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -666,6 +666,16 @@ def test_or_type_operator_with_TypeVar(self): assert TV | str == typing.Union[TV, str] assert str | TV == typing.Union[str, TV] + def test_union_parameter_chaining(self): + T = typing.TypeVar("T") + S = typing.TypeVar("S") + + self.assertEqual((float | list[T])[int], float | list[int]) + self.assertEqual(list[int | list[T]].__parameters__, (T,)) + self.assertEqual(list[int | list[T]][str], list[int | list[str]]) + self.assertEqual((list[T] | list[S]).__parameters__, (T, S)) + self.assertEqual((list[T] | list[S])[int, T], list[int] | list[T]) + def test_or_type_operator_with_forward(self): T = typing.TypeVar('T') ForwardAfter = T | 'Forward' diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst b/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst new file mode 100644 index 0000000000000..4912bca837bb1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-07-01-11-59-34.bpo-44490.xY80VR.rst @@ -0,0 +1,2 @@ +Add ``__parameters__`` attribute and ``__getitem__`` +operator to ``types.Union``. Patch provided by Yurii Karabas. diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c index 803912b7a18a4..d3d387193d357 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -198,8 +198,8 @@ tuple_add(PyObject *self, Py_ssize_t len, PyObject *item) return 0; } -static PyObject * -make_parameters(PyObject *args) +PyObject * +_Py_make_parameters(PyObject *args) { Py_ssize_t nargs = PyTuple_GET_SIZE(args); Py_ssize_t len = nargs; @@ -294,18 +294,10 @@ subs_tvars(PyObject *obj, PyObject *params, PyObject **argitems) return obj; } -static PyObject * -ga_getitem(PyObject *self, PyObject *item) +PyObject * +_Py_subs_parameters(PyObject *self, PyObject *args, PyObject *parameters, PyObject *item) { - gaobject *alias = (gaobject *)self; - // do a lookup for __parameters__ so it gets populated (if not already) - if (alias->parameters == NULL) { - alias->parameters = make_parameters(alias->args); - if (alias->parameters == NULL) { - return NULL; - } - } - Py_ssize_t nparams = PyTuple_GET_SIZE(alias->parameters); + Py_ssize_t nparams = PyTuple_GET_SIZE(parameters); if (nparams == 0) { return PyErr_Format(PyExc_TypeError, "There are no type variables left in %R", @@ -320,32 +312,32 @@ ga_getitem(PyObject *self, PyObject *item) nitems > nparams ? "many" : "few", self); } - /* Replace all type variables (specified by alias->parameters) + /* Replace all type variables (specified by parameters) with corresponding values specified by argitems. t = list[T]; t[int] -> newargs = [int] t = dict[str, T]; t[int] -> newargs = [str, int] t = dict[T, list[S]]; t[str, int] -> newargs = [str, list[int]] */ - Py_ssize_t nargs = PyTuple_GET_SIZE(alias->args); + Py_ssize_t nargs = PyTuple_GET_SIZE(args); PyObject *newargs = PyTuple_New(nargs); if (newargs == NULL) { return NULL; } for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) { - PyObject *arg = PyTuple_GET_ITEM(alias->args, iarg); + PyObject *arg = PyTuple_GET_ITEM(args, iarg); int typevar = is_typevar(arg); if (typevar < 0) { Py_DECREF(newargs); return NULL; } if (typevar) { - Py_ssize_t iparam = tuple_index(alias->parameters, nparams, arg); + Py_ssize_t iparam = tuple_index(parameters, nparams, arg); assert(iparam >= 0); arg = argitems[iparam]; Py_INCREF(arg); } else { - arg = subs_tvars(arg, alias->parameters, argitems); + arg = subs_tvars(arg, parameters, argitems); if (arg == NULL) { Py_DECREF(newargs); return NULL; @@ -354,6 +346,26 @@ ga_getitem(PyObject *self, PyObject *item) PyTuple_SET_ITEM(newargs, iarg, arg); } + return newargs; +} + +static PyObject * +ga_getitem(PyObject *self, PyObject *item) +{ + gaobject *alias = (gaobject *)self; + // Populate __parameters__ if needed. + if (alias->parameters == NULL) { + alias->parameters = _Py_make_parameters(alias->args); + if (alias->parameters == NULL) { + return NULL; + } + } + + PyObject *newargs = _Py_subs_parameters(self, alias->args, alias->parameters, item); + if (newargs == NULL) { + return NULL; + } + PyObject *res = Py_GenericAlias(alias->origin, newargs); Py_DECREF(newargs); @@ -550,7 +562,7 @@ ga_parameters(PyObject *self, void *unused) { gaobject *alias = (gaobject *)self; if (alias->parameters == NULL) { - alias->parameters = make_parameters(alias->args); + alias->parameters = _Py_make_parameters(alias->args); if (alias->parameters == NULL) { return NULL; } diff --git a/Objects/unionobject.c b/Objects/unionobject.c index 8435763b5ea7c..d2a10dfec858e 100644 --- a/Objects/unionobject.c +++ b/Objects/unionobject.c @@ -8,6 +8,7 @@ typedef struct { PyObject_HEAD PyObject *args; + PyObject *parameters; } unionobject; static void @@ -18,6 +19,7 @@ unionobject_dealloc(PyObject *self) _PyObject_GC_UNTRACK(self); Py_XDECREF(alias->args); + Py_XDECREF(alias->parameters); Py_TYPE(self)->tp_free(self); } @@ -26,6 +28,7 @@ union_traverse(PyObject *self, visitproc visit, void *arg) { unionobject *alias = (unionobject *)self; Py_VISIT(alias->args); + Py_VISIT(alias->parameters); return 0; } @@ -435,6 +438,53 @@ static PyMethodDef union_methods[] = { {"__subclasscheck__", union_subclasscheck, METH_O}, {0}}; + +static PyObject * +union_getitem(PyObject *self, PyObject *item) +{ + unionobject *alias = (unionobject *)self; + // Populate __parameters__ if needed. + if (alias->parameters == NULL) { + alias->parameters = _Py_make_parameters(alias->args); + if (alias->parameters == NULL) { + return NULL; + } + } + + PyObject *newargs = _Py_subs_parameters(self, alias->args, alias->parameters, item); + if (newargs == NULL) { + return NULL; + } + + PyObject *res = _Py_Union(newargs); + + Py_DECREF(newargs); + return res; +} + +static PyMappingMethods union_as_mapping = { + .mp_subscript = union_getitem, +}; + +static PyObject * +union_parameters(PyObject *self, void *Py_UNUSED(unused)) +{ + unionobject *alias = (unionobject *)self; + if (alias->parameters == NULL) { + alias->parameters = _Py_make_parameters(alias->args); + if (alias->parameters == NULL) { + return NULL; + } + } + Py_INCREF(alias->parameters); + return alias->parameters; +} + +static PyGetSetDef union_properties[] = { + {"__parameters__", union_parameters, (setter)NULL, "Type variables in the types.Union.", NULL}, + {0} +}; + static PyNumberMethods union_as_number = { .nb_or = _Py_union_type_or, // Add __or__ function }; @@ -456,8 +506,10 @@ PyTypeObject _Py_UnionType = { .tp_members = union_members, .tp_methods = union_methods, .tp_richcompare = union_richcompare, + .tp_as_mapping = &union_as_mapping, .tp_as_number = &union_as_number, .tp_repr = union_repr, + .tp_getset = union_properties, }; PyObject * @@ -489,6 +541,7 @@ _Py_Union(PyObject *args) return NULL; } + result->parameters = NULL; result->args = dedup_and_flatten_args(args); _PyObject_GC_TRACK(result); if (result->args == NULL) {

1 0

bpo-38291: Fix a spurious warning when using help(object) (#27039)
by gvanrossum 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/8b849ea0f3482ad834e7989ff474dd5db2… commit: 8b849ea0f3482ad834e7989ff474dd5db2f295c8 branch: main author: Sebastian Rittau <srittau(a)rittau.biz> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-07-06T08:01:15-07:00 summary: bpo-38291: Fix a spurious warning when using help(object) (#27039) help(object) via pydoc.TextDoc.docclass(object) iterates over the subclasses of object, which includes typing.io and typing.re if typing is imported. It tries to access cls.__module__ for each of those sub-classes. This change suppresses warnings when accessing cls.__module__. files: M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index 2287f0521a364..ca05fb54bf428 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -2512,7 +2512,7 @@ def __enter__(self) -> 'TextIO': class _DeprecatedType(type): def __getattribute__(cls, name): - if name != "__dict__" and name in cls.__dict__: + if name not in ("__dict__", "__module__") and name in cls.__dict__: warnings.warn( f"{cls.__name__} is deprecated, import directly " f"from typing instead. {cls.__name__} will be removed "

1 0

Fix Sphinx directive type in 3.6.14 changelog.
by ned-deily 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/0a0a135bae2692d069b18d2d590397fbe0… commit: 0a0a135bae2692d069b18d2d590397fbe0a0d39a branch: 3.6 author: Ned Deily <nad(a)python.org> committer: ned-deily <nad(a)python.org> date: 2021-07-05T19:47:27-04:00 summary: Fix Sphinx directive type in 3.6.14 changelog. files: M Misc/NEWS.d/3.6.14.rst diff --git a/Misc/NEWS.d/3.6.14.rst b/Misc/NEWS.d/3.6.14.rst index 3569f7189a3889..c0bfe41a166bff 100644 --- a/Misc/NEWS.d/3.6.14.rst +++ b/Misc/NEWS.d/3.6.14.rst @@ -4,7 +4,7 @@ .. release date: 2021-06-28 .. section: Security -mod:`http.client` now avoids infinitely reading potential HTTP headers after +:mod:`http.client` now avoids infinitely reading potential HTTP headers after a ``100 Continue`` status response from the server. ..

1 0

Fix Sphinx directive typo in 3.7.11 changelog.
by ned-deily 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/041bfafeb00b0e5e565986b01c00bf9cdd… commit: 041bfafeb00b0e5e565986b01c00bf9cddce3b4c branch: 3.7 author: Ned Deily <nad(a)python.org> committer: ned-deily <nad(a)python.org> date: 2021-07-05T19:46:32-04:00 summary: Fix Sphinx directive typo in 3.7.11 changelog. files: M Misc/NEWS.d/3.7.11.rst diff --git a/Misc/NEWS.d/3.7.11.rst b/Misc/NEWS.d/3.7.11.rst index be63cd164ae3a2..7e5308a7c62755 100644 --- a/Misc/NEWS.d/3.7.11.rst +++ b/Misc/NEWS.d/3.7.11.rst @@ -4,7 +4,7 @@ .. release date: 2021-06-28 .. section: Security -mod:`http.client` now avoids infinitely reading potential HTTP headers after +:mod:`http.client` now avoids infinitely reading potential HTTP headers after a ``100 Continue`` status response from the server. ..

1 0

bpo-44563: Fix error handling in tee.fromiterable() (GH-27020) (GH-27041)
by pablogsal 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/645e527298b1f24625783338076330037d… commit: 645e527298b1f24625783338076330037d860162 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-07-05T23:34:53+01:00 summary: bpo-44563: Fix error handling in tee.fromiterable() (GH-27020) (GH-27041) In debug build failed tee.fromiterable() corrupted the linked list of all GC objects. (cherry picked from commit f64de53ff01e734d48d1d42195443d7d1646f220) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Modules/itertoolsmodule.c diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 293735a886428..643f47b045046 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -863,7 +863,7 @@ static PyObject * tee_fromiterable(PyObject *iterable) { teeobject *to; - PyObject *it = NULL; + PyObject *it; it = PyObject_GetIter(iterable); if (it == NULL) @@ -873,21 +873,22 @@ tee_fromiterable(PyObject *iterable) goto done; } - to = PyObject_GC_New(teeobject, &tee_type); - if (to == NULL) - goto done; - to->dataobj = (teedataobject *)teedataobject_newinternal(it); - if (!to->dataobj) { - PyObject_GC_Del(to); + PyObject *dataobj = teedataobject_newinternal(it); + if (!dataobj) { to = NULL; goto done; } - + to = PyObject_GC_New(teeobject, &tee_type); + if (to == NULL) { + Py_DECREF(dataobj); + goto done; + } + to->dataobj = (teedataobject *)dataobj; to->index = 0; to->weakreflist = NULL; PyObject_GC_Track(to); done: - Py_XDECREF(it); + Py_DECREF(it); return (PyObject *)to; }

1 0

bpo-44563: Fix error handling in tee.fromiterable() (GH-27020) (GH-27042)
by pablogsal 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/324b93295fd81133d2dd597c3e3a0333f6… commit: 324b93295fd81133d2dd597c3e3a0333f6c9d95b branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-07-05T23:34:01+01:00 summary: bpo-44563: Fix error handling in tee.fromiterable() (GH-27020) (GH-27042) In debug build failed tee.fromiterable() corrupted the linked list of all GC objects. (cherry picked from commit f64de53ff01e734d48d1d42195443d7d1646f220) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Modules/itertoolsmodule.c diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 95ef8d79a16533..bc5382af7e98e1 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -729,7 +729,7 @@ static PyObject * tee_fromiterable(PyObject *iterable) { teeobject *to; - PyObject *it = NULL; + PyObject *it; it = PyObject_GetIter(iterable); if (it == NULL) @@ -739,21 +739,22 @@ tee_fromiterable(PyObject *iterable) goto done; } - to = PyObject_GC_New(teeobject, &tee_type); - if (to == NULL) - goto done; - to->dataobj = (teedataobject *)teedataobject_newinternal(it); - if (!to->dataobj) { - PyObject_GC_Del(to); + PyObject *dataobj = teedataobject_newinternal(it); + if (!dataobj) { to = NULL; goto done; } - + to = PyObject_GC_New(teeobject, &tee_type); + if (to == NULL) { + Py_DECREF(dataobj); + goto done; + } + to->dataobj = (teedataobject *)dataobj; to->index = 0; to->weakreflist = NULL; PyObject_GC_Track(to); done: - Py_XDECREF(it); + Py_DECREF(it); return (PyObject *)to; }

1 0

bpo-44563: Fix error handling in tee.fromiterable() (GH-27020)
by pablogsal 06 Jul '21

06 Jul '21

https://github.com/python/cpython/commit/f64de53ff01e734d48d1d42195443d7d16… commit: f64de53ff01e734d48d1d42195443d7d1646f220 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-07-05T23:19:35+01:00 summary: bpo-44563: Fix error handling in tee.fromiterable() (GH-27020) In debug build failed tee.fromiterable() corrupted the linked list of all GC objects. files: M Modules/itertoolsmodule.c diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 293735a886428b..643f47b045046c 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -863,7 +863,7 @@ static PyObject * tee_fromiterable(PyObject *iterable) { teeobject *to; - PyObject *it = NULL; + PyObject *it; it = PyObject_GetIter(iterable); if (it == NULL) @@ -873,21 +873,22 @@ tee_fromiterable(PyObject *iterable) goto done; } - to = PyObject_GC_New(teeobject, &tee_type); - if (to == NULL) - goto done; - to->dataobj = (teedataobject *)teedataobject_newinternal(it); - if (!to->dataobj) { - PyObject_GC_Del(to); + PyObject *dataobj = teedataobject_newinternal(it); + if (!dataobj) { to = NULL; goto done; } - + to = PyObject_GC_New(teeobject, &tee_type); + if (to == NULL) { + Py_DECREF(dataobj); + goto done; + } + to->dataobj = (teedataobject *)dataobj; to->index = 0; to->weakreflist = NULL; PyObject_GC_Track(to); done: - Py_XDECREF(it); + Py_DECREF(it); return (PyObject *)to; }

1 0

bpo-43453: Update and re-add example to typing runtime_checkable (GH-27013)
by miss-islington 05 Jul '21

05 Jul '21

https://github.com/python/cpython/commit/846cc4d28025ac4319069ec3c6db9526c7… commit: 846cc4d28025ac4319069ec3c6db9526c75efd40 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-07-05T13:46:02-07:00 summary: bpo-43453: Update and re-add example to typing runtime_checkable (GH-27013) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> (cherry picked from commit 17f94e28882e1e2b331ace93f42e8615383dee59) Co-authored-by: andrei kulakov <andrei.avk(a)gmail.com> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index e9980a7745d69..b1d67e46fbb5d 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -1232,8 +1232,13 @@ These are not used in annotations. They are building blocks for creating generic .. note:: - :func:`runtime_checkable` will check only the presence of the required methods, - not their type signatures. + :func:`runtime_checkable` will check only the presence of the required + methods, not their type signatures. For example, :class:`ssl.SSLObject` + is a class, therefore it passes an :func:`issubclass` + check against :data:`Callable`. However, the + :meth:`ssl.SSLObject.__init__` method exists only to raise a + :exc:`TypeError` with a more informative message, therefore making + it impossible to call (instantiate) :class:`ssl.SSLObject`. .. versionadded:: 3.8

1 0

bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h during build on Windows (GH-26984)
by zooba 05 Jul '21

05 Jul '21

https://github.com/python/cpython/commit/f3289a50503ed1a809d77fb03744bdcc7b… commit: f3289a50503ed1a809d77fb03744bdcc7b9f1093 branch: 3.10 author: Steve Dower <steve.dower(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2021-07-05T17:28:00+01:00 summary: bpo-44479: Regenerate test_frozenmain.h and frozen_hello.h during build on Windows (GH-26984) files: M PCbuild/_freeze_importlib.vcxproj M PCbuild/python.vcxproj M PCbuild/regen.targets diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj index 52d8f1a64bb6b9..e437412a161ce5 100644 --- a/PCbuild/_freeze_importlib.vcxproj +++ b/PCbuild/_freeze_importlib.vcxproj @@ -123,6 +123,11 @@ <IntFile>$(IntDir)importlib_zipimport.g.h</IntFile> <OutFile>$(PySourcePath)Python\importlib_zipimport.h</OutFile> </None> + <None Include="..\Tools\freeze\flag.py"> + <ModName>hello</ModName> + <IntFile>$(IntDir)frozen_hello.g.h</IntFile> + <OutFile>$(PySourcePath)Python\frozen_hello.h</OutFile> + </None> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> @@ -130,11 +135,6 @@ <Target Name="_RebuildImportLib"> <Exec Command='"$(TargetPath)" "%(None.ModName)" "%(None.FullPath)" "%(None.IntFile)"' /> - <PropertyGroup> - <_OldContent Condition="Exists($(OutTargetPath))"></_OldContent> - <_NewContent Condition="Exists($(IntTargetPath))">$([System.IO.File]::ReadAllText($(IntTargetPath)).Replace(`
`, `
`))</_NewContent> - </PropertyGroup> - <Copy SourceFiles="%(None.IntFile)" DestinationFiles="%(None.OutFile)" Condition="!Exists(%(None.OutFile)) or (Exists(%(None.IntFile)) and '$([System.IO.File]::ReadAllText(%(None.OutFile)).Replace(`
`, `
`))' != '$([System.IO.File]::ReadAllText(%(None.IntFile)).Replace(`
`, `
`))')"> @@ -153,9 +153,7 @@ </Target> <Target Name="_CleanImportLib" BeforeTargets="CoreClean"> <ItemGroup> - <Clean Include="$(IntDir)importlib.g.h" /> - <Clean Include="$(IntDir)importlib_external.g.h" /> - <Clean Include="$(IntDir)importlib_zipimport.g.h" /> + <Clean Include="%(None.IntFile)" /> </ItemGroup> </Target> </Project> diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 2094420a8df395..b58945a4d19b6c 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -114,7 +114,9 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="regen.targets" /> </ImportGroup> + <Target Name="_TriggerPostRegen" AfterTargets="Build" DependsOnTargets="PostBuildRegen" /> <Target Name="ValidateUcrtbase" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGInstrument' and $(Platform) != 'ARM' and $(Platform) != 'ARM64'"> <PropertyGroup> <UcrtName>ucrtbase</UcrtName> @@ -145,23 +147,4 @@ $(_PGOPath) </PropertyGroup> <WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" /> </Target> - <Target Name="GenerateLicense" AfterTargets="AfterBuild"> - <ItemGroup> - <LicenseFiles Include="$(PySourcePath)LICENSE; - $(PySourcePath)PC\crtlicense.txt; - $(bz2Dir)LICENSE; - $(opensslOutDir)LICENSE; - $(libffiDir)LICENSE;" /> - <LicenseFiles Include="$(tcltkDir)tcllicense.terms; - $(tcltkDir)tklicense.terms; - $(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" /> - <_LicenseFiles Include="@(LicenseFiles)"> - <Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content> - </_LicenseFiles> - </ItemGroup> - - <WriteLinesToFile File="$(OutDir)LICENSE.txt" - Overwrite="true" - Lines="@(_LicenseFiles->'%(Content)')" /> - </Target> </Project> diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets index 4d386cfa5f387f..7c956c4bc58d27 100644 --- a/PCbuild/regen.targets +++ b/PCbuild/regen.targets @@ -73,12 +73,44 @@ </Target> <Target Name="_RegenKeywords" Inputs="@(_KeywordSources)" Outputs="@(_KeywordOutputs)"> - <Message Text="Regenerate @(KeywordOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> + <Message Text="Regenerate @(_KeywordOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <Exec Command="set PYTHONPATH=Tools\peg_generator%0D%0A$(PythonForBuild) -m pegen.keywordgen Grammar\python.gram Grammar\Tokens Lib\keyword.py" WorkingDirectory="$(PySourcePath)" /> </Target> - + <Target Name="Regen" DependsOnTargets="_TouchRegenSources;_RegenPegen;_RegenAST_H;_RegenOpcodes;_RegenTokens;_RegenKeywords"> <Message Text="Generated sources are up to date" Importance="high" /> </Target> + + + <ItemGroup> + <_TestFrozenSources Include="$(PySourcePath)Programs\freeze_test_frozenmain.py; + $(PySourcePath)Programs\test_frozenmain.py; + @(_OpcodeOutputs)" /> + <_TestFrozenOutputs Include="$(PySourcePath)Programs\test_frozenmain.h" /> + <_LicenseSources Include="$(PySourcePath)LICENSE; + $(PySourcePath)PC\crtlicense.txt; + $(bz2Dir)LICENSE; + $(opensslOutDir)LICENSE; + $(libffiDir)LICENSE;" /> + <_LicenseSources Include="$(tcltkDir)tcllicense.terms; + $(tcltkDir)tklicense.terms; + $(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" /> + <_LicenseOutputs Include="$(OutDir)LICENSE.txt" /> + </ItemGroup> + + <Target Name="_RegenLicense" Inputs="@(_LicenseSources)" Outputs="@(_LicenseOutputs)"> + <Message Text="Regenerate @(_LicenseOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" /> + <ItemGroup> + <_Text Include="@(_LicenseFiles)"> + <Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content> + </_Text> + </ItemGroup> + + <WriteLinesToFile File="@(_LicenseOutputs)" Overwrite="true" Lines="@(_Text->'%(Content)')" /> + </Target> + + <Target Name="PostBuildRegen" DependsOnTargets="_RegenLicense"> + <Message Text="Other generated files are up to date" Importance="high" /> + </Target> </Project>

1 0

bpo-43453: Update and re-add example to typing runtime_checkable (#27013)
by gvanrossum 05 Jul '21

05 Jul '21

https://github.com/python/cpython/commit/17f94e28882e1e2b331ace93f42e861538… commit: 17f94e28882e1e2b331ace93f42e8615383dee59 branch: main author: andrei kulakov <andrei.avk(a)gmail.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-07-05T09:23:42-07:00 summary: bpo-43453: Update and re-add example to typing runtime_checkable (#27013) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index e9980a7745d69..b1d67e46fbb5d 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -1232,8 +1232,13 @@ These are not used in annotations. They are building blocks for creating generic .. note:: - :func:`runtime_checkable` will check only the presence of the required methods, - not their type signatures. + :func:`runtime_checkable` will check only the presence of the required + methods, not their type signatures. For example, :class:`ssl.SSLObject` + is a class, therefore it passes an :func:`issubclass` + check against :data:`Callable`. However, the + :meth:`ssl.SSLObject.__init__` method exists only to raise a + :exc:`TypeError` with a more informative message, therefore making + it impossible to call (instantiate) :class:`ssl.SSLObject`. .. versionadded:: 3.8

1 0