Mailman 3 June 2021 - Python-checkins

bpo-43232: Remove previously deprecated methods on TransportSocket (GH-24538)
by serhiy-storchaka June 30, 2021

June 30, 2021

https://github.com/python/cpython/commit/1d08d85cbe49c0748a8ee03aec31f89ab8… commit: 1d08d85cbe49c0748a8ee03aec31f89ab8e81496 branch: main author: Illia Volochii <illia.volochii(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-06-30T09:19:09+03:00 summary: bpo-43232: Remove previously deprecated methods on TransportSocket (GH-24538) files: A Misc/NEWS.d/next/Library/2021-02-15-21-17-46.bpo-43232.awc4yZ.rst M Lib/asyncio/trsock.py diff --git a/Lib/asyncio/trsock.py b/Lib/asyncio/trsock.py index e9ebcc32614259..c1f20473b32030 100644 --- a/Lib/asyncio/trsock.py +++ b/Lib/asyncio/trsock.py @@ -1,5 +1,4 @@ import socket -import warnings class TransportSocket: @@ -16,13 +15,6 @@ class TransportSocket: def __init__(self, sock: socket.socket): self._sock = sock - def _na(self, what): - warnings.warn( - f"Using {what} on sockets returned from get_extra_info('socket') " - f"will be prohibited in asyncio 3.9. Please report your use case " - f"to bugs.python.org.", - DeprecationWarning, source=self) - @property def family(self): return self._sock.family @@ -90,98 +82,6 @@ def getsockname(self): def getsockbyname(self): return self._sock.getsockbyname() - def accept(self): - self._na('accept() method') - return self._sock.accept() - - def connect(self, *args, **kwargs): - self._na('connect() method') - return self._sock.connect(*args, **kwargs) - - def connect_ex(self, *args, **kwargs): - self._na('connect_ex() method') - return self._sock.connect_ex(*args, **kwargs) - - def bind(self, *args, **kwargs): - self._na('bind() method') - return self._sock.bind(*args, **kwargs) - - def ioctl(self, *args, **kwargs): - self._na('ioctl() method') - return self._sock.ioctl(*args, **kwargs) - - def listen(self, *args, **kwargs): - self._na('listen() method') - return self._sock.listen(*args, **kwargs) - - def makefile(self): - self._na('makefile() method') - return self._sock.makefile() - - def sendfile(self, *args, **kwargs): - self._na('sendfile() method') - return self._sock.sendfile(*args, **kwargs) - - def close(self): - self._na('close() method') - return self._sock.close() - - def detach(self): - self._na('detach() method') - return self._sock.detach() - - def sendmsg_afalg(self, *args, **kwargs): - self._na('sendmsg_afalg() method') - return self._sock.sendmsg_afalg(*args, **kwargs) - - def sendmsg(self, *args, **kwargs): - self._na('sendmsg() method') - return self._sock.sendmsg(*args, **kwargs) - - def sendto(self, *args, **kwargs): - self._na('sendto() method') - return self._sock.sendto(*args, **kwargs) - - def send(self, *args, **kwargs): - self._na('send() method') - return self._sock.send(*args, **kwargs) - - def sendall(self, *args, **kwargs): - self._na('sendall() method') - return self._sock.sendall(*args, **kwargs) - - def set_inheritable(self, *args, **kwargs): - self._na('set_inheritable() method') - return self._sock.set_inheritable(*args, **kwargs) - - def share(self, process_id): - self._na('share() method') - return self._sock.share(process_id) - - def recv_into(self, *args, **kwargs): - self._na('recv_into() method') - return self._sock.recv_into(*args, **kwargs) - - def recvfrom_into(self, *args, **kwargs): - self._na('recvfrom_into() method') - return self._sock.recvfrom_into(*args, **kwargs) - - def recvmsg_into(self, *args, **kwargs): - self._na('recvmsg_into() method') - return self._sock.recvmsg_into(*args, **kwargs) - - def recvmsg(self, *args, **kwargs): - self._na('recvmsg() method') - return self._sock.recvmsg(*args, **kwargs) - - def recvfrom(self, *args, **kwargs): - self._na('recvfrom() method') - return self._sock.recvfrom(*args, **kwargs) - - def recv(self, *args, **kwargs): - self._na('recv() method') - return self._sock.recv(*args, **kwargs) - def settimeout(self, value): if value == 0: return @@ -196,11 +96,3 @@ def setblocking(self, flag): return raise ValueError( 'setblocking(): transport sockets cannot be blocking') - - def __enter__(self): - self._na('context manager protocol') - return self._sock.__enter__() - - def __exit__(self, *err): - self._na('context manager protocol') - return self._sock.__exit__(*err) diff --git a/Misc/NEWS.d/next/Library/2021-02-15-21-17-46.bpo-43232.awc4yZ.rst b/Misc/NEWS.d/next/Library/2021-02-15-21-17-46.bpo-43232.awc4yZ.rst new file mode 100644 index 00000000000000..a527a7ba95657f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-02-15-21-17-46.bpo-43232.awc4yZ.rst @@ -0,0 +1,2 @@ +Prohibit previously deprecated potentially disruptive operations on +:class:`asyncio.trsock.TransportSocket`. Patch by Illia Volochii.

1 0

bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950) (GH-26960)
by pablogsal June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/f790bc8084d3dfd723889740f9129ac8fc… commit: f790bc8084d3dfd723889740f9129ac8fcb2fa02 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-30T00:19:32+01:00 summary: bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950) (GH-26960) (cherry picked from commit e2fea101fd5517f33371b04432842b971021c3bf) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst M Lib/test/test_weakref.py M Objects/weakrefobject.c diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 56a42f055d0b54..dd5a781ed59d8b 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -422,14 +422,20 @@ def __reversed__(self): self.assertEqual("".join(reversed(weakref.proxy(obj))), "cba") def test_proxy_hash(self): - cool_hash = 299_792_458 - class MyObj: def __hash__(self): - return cool_hash + return 42 + + obj = MyObj() + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) + + class MyObj: + __hash__ = None obj = MyObj() - self.assertEqual(hash(weakref.proxy(obj)), cool_hash) + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) def test_getweakrefcount(self): o = C() diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst new file mode 100644 index 00000000000000..aa51a7478583b1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst @@ -0,0 +1,3 @@ +Remove the pass-through for :func:`hash` of :class:`weakref.proxy` objects +to prevent unintended consequences when the original referred object +dies while the proxy is part of a hashable object. Patch by Pablo Galindo. diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 313e8abab5a25f..c36d2395cc8c53 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -732,21 +732,6 @@ static PyMappingMethods proxy_as_mapping = { }; -static Py_hash_t -proxy_hash(PyObject *self) -{ - PyWeakReference *proxy = (PyWeakReference *)self; - if (!proxy_checkref(proxy)) { - return -1; - } - PyObject *obj = PyWeakref_GET_OBJECT(proxy); - Py_INCREF(obj); - Py_hash_t res = PyObject_Hash(obj); - Py_DECREF(obj); - return res; -} - - PyTypeObject _PyWeakref_ProxyType = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -763,7 +748,8 @@ _PyWeakref_ProxyType = { &proxy_as_number, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ - proxy_hash, /* tp_hash */ +// Notice that tp_hash is intentionally omitted as proxies are "mutable" (when the reference dies). + 0, /* tp_hash */ 0, /* tp_call */ proxy_str, /* tp_str */ proxy_getattr, /* tp_getattro */

1 0

bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950)
by miss-islington June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/2df13e1211cf420bf6557df02e694bf165… commit: 2df13e1211cf420bf6557df02e694bf1653a0ebe 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-06-29T16:19:06-07:00 summary: bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950) (cherry picked from commit e2fea101fd5517f33371b04432842b971021c3bf) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst M Lib/test/test_weakref.py M Objects/weakrefobject.c diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 56a42f055d0b54..dd5a781ed59d8b 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -422,14 +422,20 @@ def __reversed__(self): self.assertEqual("".join(reversed(weakref.proxy(obj))), "cba") def test_proxy_hash(self): - cool_hash = 299_792_458 - class MyObj: def __hash__(self): - return cool_hash + return 42 + + obj = MyObj() + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) + + class MyObj: + __hash__ = None obj = MyObj() - self.assertEqual(hash(weakref.proxy(obj)), cool_hash) + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) def test_getweakrefcount(self): o = C() diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst new file mode 100644 index 00000000000000..aa51a7478583b1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst @@ -0,0 +1,3 @@ +Remove the pass-through for :func:`hash` of :class:`weakref.proxy` objects +to prevent unintended consequences when the original referred object +dies while the proxy is part of a hashable object. Patch by Pablo Galindo. diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 313e8abab5a25f..c36d2395cc8c53 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -732,21 +732,6 @@ static PyMappingMethods proxy_as_mapping = { }; -static Py_hash_t -proxy_hash(PyObject *self) -{ - PyWeakReference *proxy = (PyWeakReference *)self; - if (!proxy_checkref(proxy)) { - return -1; - } - PyObject *obj = PyWeakref_GET_OBJECT(proxy); - Py_INCREF(obj); - Py_hash_t res = PyObject_Hash(obj); - Py_DECREF(obj); - return res; -} - - PyTypeObject _PyWeakref_ProxyType = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -763,7 +748,8 @@ _PyWeakref_ProxyType = { &proxy_as_number, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ - proxy_hash, /* tp_hash */ +// Notice that tp_hash is intentionally omitted as proxies are "mutable" (when the reference dies). + 0, /* tp_hash */ 0, /* tp_call */ proxy_str, /* tp_str */ proxy_getattr, /* tp_getattro */

1 0

bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950)
by pablogsal June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/e2fea101fd5517f33371b04432842b9710… commit: e2fea101fd5517f33371b04432842b971021c3bf branch: main author: Pablo Galindo <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-29T23:58:45+01:00 summary: bpo-44523: Remove the pass-through for hash() in weakref proxy objects (GH-26950) files: A Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst M Lib/test/test_weakref.py M Objects/weakrefobject.c diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 56a42f055d0b54..dd5a781ed59d8b 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -422,14 +422,20 @@ def __reversed__(self): self.assertEqual("".join(reversed(weakref.proxy(obj))), "cba") def test_proxy_hash(self): - cool_hash = 299_792_458 - class MyObj: def __hash__(self): - return cool_hash + return 42 + + obj = MyObj() + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) + + class MyObj: + __hash__ = None obj = MyObj() - self.assertEqual(hash(weakref.proxy(obj)), cool_hash) + with self.assertRaises(TypeError): + hash(weakref.proxy(obj)) def test_getweakrefcount(self): o = C() diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst new file mode 100644 index 00000000000000..aa51a7478583b1 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-06-29-11-49-29.bpo-44523.67-ZIP.rst @@ -0,0 +1,3 @@ +Remove the pass-through for :func:`hash` of :class:`weakref.proxy` objects +to prevent unintended consequences when the original referred object +dies while the proxy is part of a hashable object. Patch by Pablo Galindo. diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 313e8abab5a25f..c36d2395cc8c53 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -732,21 +732,6 @@ static PyMappingMethods proxy_as_mapping = { }; -static Py_hash_t -proxy_hash(PyObject *self) -{ - PyWeakReference *proxy = (PyWeakReference *)self; - if (!proxy_checkref(proxy)) { - return -1; - } - PyObject *obj = PyWeakref_GET_OBJECT(proxy); - Py_INCREF(obj); - Py_hash_t res = PyObject_Hash(obj); - Py_DECREF(obj); - return res; -} - - PyTypeObject _PyWeakref_ProxyType = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -763,7 +748,8 @@ _PyWeakref_ProxyType = { &proxy_as_number, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ - proxy_hash, /* tp_hash */ +// Notice that tp_hash is intentionally omitted as proxies are "mutable" (when the reference dies). + 0, /* tp_hash */ 0, /* tp_call */ proxy_str, /* tp_str */ proxy_getattr, /* tp_getattro */

1 0

bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935) (GH-26957)
by iritkatriel June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/02859df10591789c72eb185a4f7dd9cc1e… commit: 02859df10591789c72eb185a4f7dd9cc1ea8dcbb branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-29T18:53:07+01:00 summary: bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935) (GH-26957) (cherry picked from commit 12803c59d54ff1a45a5b08cef82652ef199b3b07) Co-authored-by: Jack DeVries <58614260+jdevries3133(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst M Doc/library/atexit.rst diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst index e6fa33ac3eaa3..f7f038107d11f 100644 --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -48,11 +48,12 @@ internal error is detected, or when :func:`os._exit` is called. .. function:: unregister(func) - Remove *func* from the list of functions to be run at interpreter - shutdown. After calling :func:`unregister`, *func* is guaranteed not to be - called when the interpreter shuts down, even if it was registered more than - once. :func:`unregister` silently does nothing if *func* was not previously - registered. + Remove *func* from the list of functions to be run at interpreter shutdown. + :func:`unregister` silently does nothing if *func* was not previously + registered. If *func* has been registered more than once, every occurrence + of that function in the :mod:`atexit` call stack will be removed. Equality + comparisons (``==``) are used internally during unregistration, so function + references do not need to have matching identities. .. seealso:: diff --git a/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst new file mode 100644 index 0000000000000..1d90096e20bfa --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst @@ -0,0 +1 @@ +Clarify that atexit uses equality comparisons internally.

1 0

bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935) (GH-26956)
by iritkatriel June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/08aa26e4355da6f916da0c97d00774800e… commit: 08aa26e4355da6f916da0c97d00774800ee0fc46 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-29T18:52:27+01:00 summary: bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935) (GH-26956) (cherry picked from commit 12803c59d54ff1a45a5b08cef82652ef199b3b07) Co-authored-by: Jack DeVries <58614260+jdevries3133(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst M Doc/library/atexit.rst diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst index e6fa33ac3eaa3..f7f038107d11f 100644 --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -48,11 +48,12 @@ internal error is detected, or when :func:`os._exit` is called. .. function:: unregister(func) - Remove *func* from the list of functions to be run at interpreter - shutdown. After calling :func:`unregister`, *func* is guaranteed not to be - called when the interpreter shuts down, even if it was registered more than - once. :func:`unregister` silently does nothing if *func* was not previously - registered. + Remove *func* from the list of functions to be run at interpreter shutdown. + :func:`unregister` silently does nothing if *func* was not previously + registered. If *func* has been registered more than once, every occurrence + of that function in the :mod:`atexit` call stack will be removed. Equality + comparisons (``==``) are used internally during unregistration, so function + references do not need to have matching identities. .. seealso:: diff --git a/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst new file mode 100644 index 0000000000000..1d90096e20bfa --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst @@ -0,0 +1 @@ +Clarify that atexit uses equality comparisons internally.

1 0

bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935)
by iritkatriel June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/12803c59d54ff1a45a5b08cef82652ef19… commit: 12803c59d54ff1a45a5b08cef82652ef199b3b07 branch: main author: Jack DeVries <58614260+jdevries3133(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-29T18:28:03+01:00 summary: bpo-38062: [doc] clarify that atexit uses equality comparisons internally. (GH-26935) files: A Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst M Doc/library/atexit.rst diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst index e6fa33ac3eaa3..f7f038107d11f 100644 --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -48,11 +48,12 @@ internal error is detected, or when :func:`os._exit` is called. .. function:: unregister(func) - Remove *func* from the list of functions to be run at interpreter - shutdown. After calling :func:`unregister`, *func* is guaranteed not to be - called when the interpreter shuts down, even if it was registered more than - once. :func:`unregister` silently does nothing if *func* was not previously - registered. + Remove *func* from the list of functions to be run at interpreter shutdown. + :func:`unregister` silently does nothing if *func* was not previously + registered. If *func* has been registered more than once, every occurrence + of that function in the :mod:`atexit` call stack will be removed. Equality + comparisons (``==``) are used internally during unregistration, so function + references do not need to have matching identities. .. seealso:: diff --git a/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst new file mode 100644 index 0000000000000..1d90096e20bfa --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2021-06-28-12-13-48.bpo-38062.9Ehp9O.rst @@ -0,0 +1 @@ +Clarify that atexit uses equality comparisons internally.

1 0

bpo-44531: Fix type_repr() if tp_name is NULL (GH-26948)
by vstinner June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/823460daa9fab3d0cf00ec553d1e35635e… commit: 823460daa9fab3d0cf00ec553d1e35635ef73d40 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2021-06-29T16:39:29+02:00 summary: bpo-44531: Fix type_repr() if tp_name is NULL (GH-26948) Allow to call type_repr() on a type which is not fully initialized yet. This fix helps debugging crashes occurring early at Python initialization. files: M Objects/typeobject.c diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 3c766e9230e2b..8ee4e813ee521 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1065,6 +1065,12 @@ static PyGetSetDef type_getsets[] = { static PyObject * type_repr(PyTypeObject *type) { + if (type->tp_name == NULL) { + // type_repr() called before the type is fully initialized + // by PyType_Ready(). + return PyUnicode_FromFormat("<class at %p>", type); + } + PyObject *mod, *name, *rtn; mod = type_module(type, NULL);

1 0

bpo-42588: Update the docs for the TopologicalSorter.static_order() method (GH-26834) (GH-26952)
by pablogsal June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/3ba65cdcefcec7866be482138a5ea8aafb… commit: 3ba65cdcefcec7866be482138a5ea8aafbd07e59 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-29T15:19:05+01:00 summary: bpo-42588: Update the docs for the TopologicalSorter.static_order() method (GH-26834) (GH-26952) (cherry picked from commit 0d7f7975d55eff7e3dfcebd14e765fc6cd7d3e40) Co-authored-by: andrei kulakov <andrei.avk(a)gmail.com> Co-authored-by: andrei kulakov <andrei.avk(a)gmail.com> files: M Doc/library/graphlib.rst diff --git a/Doc/library/graphlib.rst b/Doc/library/graphlib.rst index 0faca2186b268..2bc80da4ead2a 100644 --- a/Doc/library/graphlib.rst +++ b/Doc/library/graphlib.rst @@ -154,9 +154,10 @@ .. method:: static_order() - Returns an iterable of nodes in a topological order. Using this method - does not require to call :meth:`TopologicalSorter.prepare` or - :meth:`TopologicalSorter.done`. This method is equivalent to:: + Returns an iterator object which will iterate over nodes in a topological + order. When using this method, :meth:`~TopologicalSorter.prepare` and + :meth:`~TopologicalSorter.done` should not be called. This method is + equivalent to:: def static_order(self): self.prepare() @@ -206,4 +207,4 @@ The :mod:`graphlib` module defines the following exception classes: The detected cycle can be accessed via the second element in the :attr:`~CycleError.args` attribute of the exception instance and consists in a list of nodes, such that each node is, in the graph, an immediate predecessor of the next node in the list. In the reported list, - the first and the last node will be the same, to make it clear that it is cyclic. \ No newline at end of file + the first and the last node will be the same, to make it clear that it is cyclic.

1 0

Doc: Remove trailing whitespaces. (GH-26953)
by JulienPalard June 29, 2021

June 29, 2021

https://github.com/python/cpython/commit/50148cacfaa79d199b71fec89c2dbe7efb… commit: 50148cacfaa79d199b71fec89c2dbe7efbae41ca branch: main author: Julien Palard <julien(a)palard.fr> committer: JulienPalard <julien(a)palard.fr> date: 2021-06-29T13:16:53+02:00 summary: Doc: Remove trailing whitespaces. (GH-26953) files: M Doc/whatsnew/3.11.rst diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 0ee4d29227a50..8e3d5f31754c8 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -76,15 +76,15 @@ Other Language Changes ====================== A :exc:`TypeError` is now raised instead of an :exc:`AttributeError` in -:meth:`contextlib.ExitStack.enter_context` and +:meth:`contextlib.ExitStack.enter_context` and :meth:`contextlib.AsyncExitStack.enter_async_context` for objects which do not support the :term:`context manager` or :term:`asynchronous context manager` protocols correspondingly. (Contributed by Serhiy Storchaka in :issue:`44471`.) -* A :exc:`TypeError` is now raised instead of an :exc:`AttributeError` in +* A :exc:`TypeError` is now raised instead of an :exc:`AttributeError` in :keyword:`with` and :keyword:`async with` statements for objects which do not - support the :term:`context manager` or :term:`asynchronous context manager` + support the :term:`context manager` or :term:`asynchronous context manager` protocols correspondingly. (Contributed by Serhiy Storchaka in :issue:`12022`.)

1 0