Mailman 3 March 2022 - Python-checkins

Python 3.10.4
by pablogsal March 24, 2022

March 24, 2022

https://github.com/python/cpython/commit/9d38120e335357a3b294277fd5eff0a10e… commit: 9d38120e335357a3b294277fd5eff0a10e46e043 branch: 3.10 author: Pablo Galindo <pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2022-03-23T20:12:04Z summary: Python 3.10.4 files: A Misc/NEWS.d/3.10.4.rst D Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst D Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst D Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst D Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst D Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst D Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst D Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst D Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst D Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst D Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst D Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.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 3b1a7c549ff40..482069c791a91 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -18,12 +18,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 10 -#define PY_MICRO_VERSION 3 +#define PY_MICRO_VERSION 4 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.10.3+" +#define PY_VERSION "3.10.4" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index ac7d16c346fe3..76db0426df331 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Wed Mar 16 11:26:55 2022 +# Autogenerated by Sphinx on Wed Mar 23 20:11:40 2022 topics = {'assert': 'The "assert" statement\n' '**********************\n' '\n' @@ -2418,11 +2418,11 @@ 'resulting\n' 'object is “compatible” with the exception. An object is ' 'compatible\n' - 'with an exception if it is the class or a base class of the ' - 'exception\n' - 'object, or a tuple containing an item that is the class or a ' + 'with an exception if the object is the class or a *non-virtual ' 'base\n' - 'class of the exception object.\n' + 'class* of the exception object, or a tuple containing an item ' + 'that is\n' + 'the class or a non-virtual base class of the exception object.\n' '\n' 'If no except clause matches the exception, the search for an ' 'exception\n' @@ -4399,15 +4399,17 @@ 'on members\n' ' of hashed collections including "set", "frozenset", and ' '"dict".\n' - ' "__hash__()" should return an integer. The only required ' - 'property\n' - ' is that objects which compare equal have the same hash ' - 'value; it is\n' - ' advised to mix together the hash values of the ' - 'components of the\n' - ' object that also play a part in comparison of objects by ' - 'packing\n' - ' them into a tuple and hashing the tuple. Example:\n' + ' The "__hash__()" method should return an integer. The ' + 'only required\n' + ' property is that objects which compare equal have the ' + 'same hash\n' + ' value; it is advised to mix together the hash values of ' + 'the\n' + ' components of the object that also play a part in ' + 'comparison of\n' + ' objects by packing them into a tuple and hashing the ' + 'tuple.\n' + ' Example:\n' '\n' ' def __hash__(self):\n' ' return hash((self.name, self.nick, self.color))\n' @@ -5391,11 +5393,11 @@ 'clause is\n' 'selected depending on the class of the instance: it must ' 'reference the\n' - 'class of the instance or a base class thereof. The instance ' - 'can be\n' - 'received by the handler and can carry additional information ' - 'about the\n' - 'exceptional condition.\n' + 'class of the instance or a *non-virtual base class* thereof. ' + 'The\n' + 'instance can be received by the handler and can carry ' + 'additional\n' + 'information about the exceptional condition.\n' '\n' 'Note:\n' '\n' @@ -5730,11 +5732,11 @@ 'clause is\n' 'selected depending on the class of the instance: it must ' 'reference the\n' - 'class of the instance or a base class thereof. The instance ' - 'can be\n' - 'received by the handler and can carry additional information ' - 'about the\n' - 'exceptional condition.\n' + 'class of the instance or a *non-virtual base class* thereof. ' + 'The\n' + 'instance can be received by the handler and can carry ' + 'additional\n' + 'information about the exceptional condition.\n' '\n' 'Note:\n' '\n' @@ -9303,15 +9305,17 @@ 'on members\n' ' of hashed collections including "set", "frozenset", and ' '"dict".\n' - ' "__hash__()" should return an integer. The only required ' - 'property\n' - ' is that objects which compare equal have the same hash ' - 'value; it is\n' - ' advised to mix together the hash values of the components ' - 'of the\n' - ' object that also play a part in comparison of objects by ' - 'packing\n' - ' them into a tuple and hashing the tuple. Example:\n' + ' The "__hash__()" method should return an integer. The ' + 'only required\n' + ' property is that objects which compare equal have the ' + 'same hash\n' + ' value; it is advised to mix together the hash values of ' + 'the\n' + ' components of the object that also play a part in ' + 'comparison of\n' + ' objects by packing them into a tuple and hashing the ' + 'tuple.\n' + ' Example:\n' '\n' ' def __hash__(self):\n' ' return hash((self.name, self.nick, self.color))\n' @@ -12428,10 +12432,10 @@ 'exception. For an except clause with an expression, that expression\n' 'is evaluated, and the clause matches the exception if the resulting\n' 'object is “compatible” with the exception. An object is compatible\n' - 'with an exception if it is the class or a base class of the ' - 'exception\n' - 'object, or a tuple containing an item that is the class or a base\n' - 'class of the exception object.\n' + 'with an exception if the object is the class or a *non-virtual base\n' + 'class* of the exception object, or a tuple containing an item that ' + 'is\n' + 'the class or a non-virtual base class of the exception object.\n' '\n' 'If no except clause matches the exception, the search for an ' 'exception\n' diff --git a/Misc/NEWS.d/3.10.4.rst b/Misc/NEWS.d/3.10.4.rst new file mode 100644 index 0000000000000..ac6869a671f0e --- /dev/null +++ b/Misc/NEWS.d/3.10.4.rst @@ -0,0 +1,114 @@ +.. bpo: 46968 +.. date: 2022-03-17-14-22-23 +.. nonce: 4gz4NA +.. release date: 2022-03-23 +.. section: Core and Builtins + +Check for the existence of the "sys/auxv.h" header in :mod:`faulthandler` to +avoid compilation problems in systems where this header doesn't exist. Patch +by Pablo Galindo + +.. + +.. bpo: 23691 +.. date: 2022-03-20-22-13-24 +.. nonce: Nc2TrW +.. section: Library + +Protect the :func:`re.finditer` iterator from re-entering. + +.. + +.. bpo: 42369 +.. date: 2022-03-19-19-56-04 +.. nonce: Ok828t +.. section: Library + +Fix thread safety of :meth:`zipfile._SharedFile.tell` to avoid a +"zipfile.BadZipFile: Bad CRC-32 for file" exception when reading a +:class:`ZipFile` from multiple threads. + +.. + +.. bpo: 38256 +.. date: 2022-03-19-15-54-41 +.. nonce: FoMbjE +.. section: Library + +Fix :func:`binascii.crc32` when it is compiled to use zlib'c crc32 to work +properly on inputs 4+GiB in length instead of returning the wrong result. +The workaround prior to this was to always feed the function data in +increments smaller than 4GiB or to just call the zlib module function. + +.. + +.. bpo: 39394 +.. date: 2022-03-19-13-38-29 +.. nonce: 7j6WL6 +.. section: Library + +A warning about inline flags not at the start of the regular expression now +contains the position of the flag. + +.. + +.. bpo: 47061 +.. date: 2022-03-18-13-30-40 +.. nonce: etLHK5 +.. section: Library + +Deprecate the various modules listed by :pep:`594`: + +aifc, asynchat, asyncore, audioop, cgi, cgitb, chunk, crypt, imghdr, msilib, +nntplib, nis, ossaudiodev, pipes, smtpd, sndhdr, spwd, sunau, telnetlib, uu, +xdrlib + +.. + +.. bpo: 2604 +.. date: 2022-03-16-18-25-19 +.. nonce: jeopdL +.. section: Library + +Fix bug where doctests using globals would fail when run multiple times. + +.. + +.. bpo: 45997 +.. date: 2022-03-15-18-32-12 +.. nonce: 4n2aVU +.. section: Library + +Fix :class:`asyncio.Semaphore` re-aquiring FIFO order. + +.. + +.. bpo: 47022 +.. date: 2022-03-15-09-29-52 +.. nonce: uaEDcI +.. section: Library + +The :mod:`asynchat`, :mod:`asyncore` and :mod:`smtpd` modules have been +deprecated since at least Python 3.6. Their documentation and deprecation +warnings and have now been updated to note they will removed in Python 3.12 +(:pep:`594`). + +.. + +.. bpo: 46421 +.. date: 2022-01-18-01-29-38 +.. nonce: 9LdmNr +.. section: Library + +Fix a unittest issue where if the command was invoked as ``python -m +unittest`` and the filename(s) began with a dot (.), a ``ValueError`` is +returned. + +.. + +.. bpo: 40296 +.. date: 2021-12-25-14-13-14 +.. nonce: p0YVGB +.. section: Library + +Fix supporting generic aliases in :mod:`pydoc`. diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst deleted file mode 100644 index bef1d0532b098..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst +++ /dev/null @@ -1,3 +0,0 @@ -Check for the existence of the "sys/auxv.h" header in :mod:`faulthandler` to -avoid compilation problems in systems where this header doesn't exist. Patch -by Pablo Galindo diff --git a/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst b/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst deleted file mode 100644 index ea469c916b9db..0000000000000 --- a/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst +++ /dev/null @@ -1 +0,0 @@ -Fix supporting generic aliases in :mod:`pydoc`. diff --git a/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst b/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst deleted file mode 100644 index 03ff27fd7d1a7..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst +++ /dev/null @@ -1,3 +0,0 @@ -Fix a unittest issue where if the command was invoked as ``python -m -unittest`` and the filename(s) began with a dot (.), a ``ValueError`` is -returned. diff --git a/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst b/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst deleted file mode 100644 index 0e867b9506484..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst +++ /dev/null @@ -1,4 +0,0 @@ -The :mod:`asynchat`, :mod:`asyncore` and :mod:`smtpd` modules have been -deprecated since at least Python 3.6. Their documentation and deprecation -warnings and have now been updated to note they will removed in Python 3.12 -(:pep:`594`). diff --git a/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst b/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst deleted file mode 100644 index 40d8504e5a946..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst +++ /dev/null @@ -1 +0,0 @@ -Fix :class:`asyncio.Semaphore` re-aquiring FIFO order. diff --git a/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst b/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst deleted file mode 100644 index c0fd000b2c660..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst +++ /dev/null @@ -1 +0,0 @@ -Fix bug where doctests using globals would fail when run multiple times. diff --git a/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst b/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst deleted file mode 100644 index 5445089e53c39..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst +++ /dev/null @@ -1,5 +0,0 @@ -Deprecate the various modules listed by :pep:`594`: - -aifc, asynchat, asyncore, audioop, cgi, cgitb, chunk, crypt, -imghdr, msilib, nntplib, nis, ossaudiodev, pipes, smtpd, -sndhdr, spwd, sunau, telnetlib, uu, xdrlib diff --git a/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst b/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst deleted file mode 100644 index 9285179c9fdca..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst +++ /dev/null @@ -1,2 +0,0 @@ -A warning about inline flags not at the start of the regular expression now -contains the position of the flag. diff --git a/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst b/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst deleted file mode 100644 index d9b57513b0631..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst +++ /dev/null @@ -1,5 +0,0 @@ -Fix :func:`binascii.crc32` when it is compiled to use zlib'c crc32 to -work properly on inputs 4+GiB in length instead of returning the wrong -result. The workaround prior to this was to always feed the function -data in increments smaller than 4GiB or to just call the zlib module -function. diff --git a/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst b/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst deleted file mode 100644 index 86dc3a0b81b9c..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst +++ /dev/null @@ -1 +0,0 @@ -Fix thread safety of :meth:`zipfile._SharedFile.tell` to avoid a "zipfile.BadZipFile: Bad CRC-32 for file" exception when reading a :class:`ZipFile` from multiple threads. diff --git a/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst b/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst deleted file mode 100644 index 053a2b2709ee8..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst +++ /dev/null @@ -1 +0,0 @@ -Protect the :func:`re.finditer` iterator from re-entering. diff --git a/README.rst b/README.rst index 9b708f10a2f71..215ff1e5b94ce 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -This is Python version 3.10.3 +This is Python version 3.10.4 ============================= .. image:: https://travis-ci.com/python/cpython.svg?branch=master

1 0

bpo-46480: rephrase typing.assert_type docs (GH-32069)
by JelleZijlstra March 24, 2022

March 24, 2022

https://github.com/python/cpython/commit/3354245daf89ca2c760c2c3e5b69a571f2… commit: 3354245daf89ca2c760c2c3e5b69a571f25073ed branch: main author: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-03-23T19:15:06-07:00 summary: bpo-46480: rephrase typing.assert_type docs (GH-32069) The goal here is to reduce potential confusion between `assert_type(val, type)` and `assert isinstance(val, typ)`. The former is meant to ask a type checker to confirm a fact, the latter is meant to tell a type checker a fact. The behaviour of the latter more closely resembles what I'd expect from the prior phrasing of "assert [something] to the type checker". files: M Doc/library/typing.rst M Lib/typing.py diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 57979cbb08e69..4d833dc497f17 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -2150,7 +2150,7 @@ Functions and decorators .. function:: assert_type(val, typ, /) - Assert (to the type checker) that *val* has an inferred type of *typ*. + Ask a static type checker to confirm that *val* has an inferred type of *typ*. When the type checker encounters a call to ``assert_type()``, it emits an error if the value is not of the specified type:: diff --git a/Lib/typing.py b/Lib/typing.py index f0e84900d7f80..64b348e0b9d5c 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -2085,7 +2085,7 @@ def cast(typ, val): def assert_type(val, typ, /): - """Assert (to the type checker) that the value is of the given type. + """Ask a static type checker to confirm that the value is of the given type. When the type checker encounters a call to assert_type(), it emits an error if the value is not of the specified type::

1 0

Python 3.9.12
by ambv March 24, 2022

March 24, 2022

https://github.com/python/cpython/commit/b28265d7e6a41a4a0e227b37f4fbbc4d03… commit: b28265d7e6a41a4a0e227b37f4fbbc4d03a0a707 branch: 3.9 author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2022-03-23T22:12:08+01:00 summary: Python 3.9.12 files: A Misc/NEWS.d/3.9.12.rst D Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst D Misc/NEWS.d/next/Library/2019-05-07-14-25-45.bpo-14156.0FaHXE.rst D Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst D Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst D Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst D Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst D Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst D Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst D Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst D Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst D Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst D Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst D Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.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 10792996992af..a4418b0a6c691 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -18,12 +18,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 9 -#define PY_MICRO_VERSION 11 +#define PY_MICRO_VERSION 12 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.9.11+" +#define PY_VERSION "3.9.12" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index 0e63c31f1b4fe..2546eb933bcbd 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Tue Mar 15 21:44:32 2022 +# Autogenerated by Sphinx on Wed Mar 23 22:08:02 2022 topics = {'assert': 'The "assert" statement\n' '**********************\n' '\n' @@ -2416,11 +2416,11 @@ 'resulting\n' 'object is “compatible” with the exception. An object is ' 'compatible\n' - 'with an exception if it is the class or a base class of the ' - 'exception\n' - 'object, or a tuple containing an item that is the class or a ' + 'with an exception if the object is the class or a *non-virtual ' 'base\n' - 'class of the exception object.\n' + 'class* of the exception object, or a tuple containing an item ' + 'that is\n' + 'the class or a non-virtual base class of the exception object.\n' '\n' 'If no except clause matches the exception, the search for an ' 'exception\n' @@ -3567,15 +3567,17 @@ 'on members\n' ' of hashed collections including "set", "frozenset", and ' '"dict".\n' - ' "__hash__()" should return an integer. The only required ' - 'property\n' - ' is that objects which compare equal have the same hash ' - 'value; it is\n' - ' advised to mix together the hash values of the ' - 'components of the\n' - ' object that also play a part in comparison of objects by ' - 'packing\n' - ' them into a tuple and hashing the tuple. Example:\n' + ' The "__hash__()" method should return an integer. The ' + 'only required\n' + ' property is that objects which compare equal have the ' + 'same hash\n' + ' value; it is advised to mix together the hash values of ' + 'the\n' + ' components of the object that also play a part in ' + 'comparison of\n' + ' objects by packing them into a tuple and hashing the ' + 'tuple.\n' + ' Example:\n' '\n' ' def __hash__(self):\n' ' return hash((self.name, self.nick, self.color))\n' @@ -4559,11 +4561,11 @@ 'clause is\n' 'selected depending on the class of the instance: it must ' 'reference the\n' - 'class of the instance or a base class thereof. The instance ' - 'can be\n' - 'received by the handler and can carry additional information ' - 'about the\n' - 'exceptional condition.\n' + 'class of the instance or a *non-virtual base class* thereof. ' + 'The\n' + 'instance can be received by the handler and can carry ' + 'additional\n' + 'information about the exceptional condition.\n' '\n' 'Note:\n' '\n' @@ -4886,11 +4888,11 @@ 'clause is\n' 'selected depending on the class of the instance: it must ' 'reference the\n' - 'class of the instance or a base class thereof. The instance ' - 'can be\n' - 'received by the handler and can carry additional information ' - 'about the\n' - 'exceptional condition.\n' + 'class of the instance or a *non-virtual base class* thereof. ' + 'The\n' + 'instance can be received by the handler and can carry ' + 'additional\n' + 'information about the exceptional condition.\n' '\n' 'Note:\n' '\n' @@ -8440,15 +8442,17 @@ 'on members\n' ' of hashed collections including "set", "frozenset", and ' '"dict".\n' - ' "__hash__()" should return an integer. The only required ' - 'property\n' - ' is that objects which compare equal have the same hash ' - 'value; it is\n' - ' advised to mix together the hash values of the components ' - 'of the\n' - ' object that also play a part in comparison of objects by ' - 'packing\n' - ' them into a tuple and hashing the tuple. Example:\n' + ' The "__hash__()" method should return an integer. The ' + 'only required\n' + ' property is that objects which compare equal have the ' + 'same hash\n' + ' value; it is advised to mix together the hash values of ' + 'the\n' + ' components of the object that also play a part in ' + 'comparison of\n' + ' objects by packing them into a tuple and hashing the ' + 'tuple.\n' + ' Example:\n' '\n' ' def __hash__(self):\n' ' return hash((self.name, self.nick, self.color))\n' @@ -11531,10 +11535,10 @@ 'exception. For an except clause with an expression, that expression\n' 'is evaluated, and the clause matches the exception if the resulting\n' 'object is “compatible” with the exception. An object is compatible\n' - 'with an exception if it is the class or a base class of the ' - 'exception\n' - 'object, or a tuple containing an item that is the class or a base\n' - 'class of the exception object.\n' + 'with an exception if the object is the class or a *non-virtual base\n' + 'class* of the exception object, or a tuple containing an item that ' + 'is\n' + 'the class or a non-virtual base class of the exception object.\n' '\n' 'If no except clause matches the exception, the search for an ' 'exception\n' diff --git a/Misc/NEWS.d/3.9.12.rst b/Misc/NEWS.d/3.9.12.rst new file mode 100644 index 0000000000000..7a38f30e1348e --- /dev/null +++ b/Misc/NEWS.d/3.9.12.rst @@ -0,0 +1,137 @@ +.. bpo: 46968 +.. date: 2022-03-17-14-22-23 +.. nonce: 4gz4NA +.. release date: 2022-03-23 +.. section: Core and Builtins + +Check for the existence of the "sys/auxv.h" header in :mod:`faulthandler` to +avoid compilation problems in systems where this header doesn't exist. Patch +by Pablo Galindo + +.. + +.. bpo: 47101 +.. date: 2022-03-23-15-31-02 +.. nonce: rVSld- +.. section: Library + +:const:`hashlib.algorithms_available` now lists only algorithms that are +provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are +not listed unless the legacy provider has been loaded into the default OSSL +context. + +.. + +.. bpo: 23691 +.. date: 2022-03-20-22-13-24 +.. nonce: Nc2TrW +.. section: Library + +Protect the :func:`re.finditer` iterator from re-entering. + +.. + +.. bpo: 42369 +.. date: 2022-03-19-19-56-04 +.. nonce: Ok828t +.. section: Library + +Fix thread safety of :meth:`zipfile._SharedFile.tell` to avoid a +"zipfile.BadZipFile: Bad CRC-32 for file" exception when reading a +:class:`ZipFile` from multiple threads. + +.. + +.. bpo: 38256 +.. date: 2022-03-19-15-54-41 +.. nonce: FoMbjE +.. section: Library + +Fix :func:`binascii.crc32` when it is compiled to use zlib'c crc32 to work +properly on inputs 4+GiB in length instead of returning the wrong result. +The workaround prior to this was to always feed the function data in +increments smaller than 4GiB or to just call the zlib module function. + +.. + +.. bpo: 39394 +.. date: 2022-03-19-13-38-29 +.. nonce: 7j6WL6 +.. section: Library + +A warning about inline flags not at the start of the regular expression now +contains the position of the flag. + +.. + +.. bpo: 47061 +.. date: 2022-03-18-13-30-40 +.. nonce: etLHK5 +.. section: Library + +Deprecate the various modules listed by :pep:`594`: + +aifc, asynchat, asyncore, audioop, cgi, cgitb, chunk, crypt, imghdr, msilib, +nntplib, nis, ossaudiodev, pipes, smtpd, sndhdr, spwd, sunau, telnetlib, uu, +xdrlib + +.. + +.. bpo: 2604 +.. date: 2022-03-16-18-25-19 +.. nonce: jeopdL +.. section: Library + +Fix bug where doctests using globals would fail when run multiple times. + +.. + +.. bpo: 45997 +.. date: 2022-03-15-18-32-12 +.. nonce: 4n2aVU +.. section: Library + +Fix :class:`asyncio.Semaphore` re-aquiring FIFO order. + +.. + +.. bpo: 47022 +.. date: 2022-03-15-09-29-52 +.. nonce: uaEDcI +.. section: Library + +The :mod:`asynchat`, :mod:`asyncore` and :mod:`smtpd` modules have been +deprecated since at least Python 3.6. Their documentation has now been +updated to note they will removed in Python 3.12 (:pep:`594`). + +.. + +.. bpo: 46421 +.. date: 2022-01-18-01-29-38 +.. nonce: 9LdmNr +.. section: Library + +Fix a unittest issue where if the command was invoked as ``python -m +unittest`` and the filename(s) began with a dot (.), a ``ValueError`` is +returned. + +.. + +.. bpo: 40296 +.. date: 2021-12-25-14-13-14 +.. nonce: p0YVGB +.. section: Library + +Fix supporting generic aliases in :mod:`pydoc`. + +.. + +.. bpo: 14156 +.. date: 2019-05-07-14-25-45 +.. nonce: 0FaHXE +.. section: Library + +argparse.FileType now supports an argument of '-' in binary mode, returning +the .buffer attribute of sys.stdin/sys.stdout as appropriate. Modes +including 'x' and 'a' are treated equivalently to 'w' when argument is '-'. +Patch contributed by Josh Rosenberg diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst deleted file mode 100644 index bef1d0532b098..0000000000000 --- a/Misc/NEWS.d/next/Core and Builtins/2022-03-17-14-22-23.bpo-46968.4gz4NA.rst +++ /dev/null @@ -1,3 +0,0 @@ -Check for the existence of the "sys/auxv.h" header in :mod:`faulthandler` to -avoid compilation problems in systems where this header doesn't exist. Patch -by Pablo Galindo diff --git a/Misc/NEWS.d/next/Library/2019-05-07-14-25-45.bpo-14156.0FaHXE.rst b/Misc/NEWS.d/next/Library/2019-05-07-14-25-45.bpo-14156.0FaHXE.rst deleted file mode 100644 index 7bfc917a2a750..0000000000000 --- a/Misc/NEWS.d/next/Library/2019-05-07-14-25-45.bpo-14156.0FaHXE.rst +++ /dev/null @@ -1,4 +0,0 @@ -argparse.FileType now supports an argument of '-' in binary mode, returning -the .buffer attribute of sys.stdin/sys.stdout as appropriate. Modes -including 'x' and 'a' are treated equivalently to 'w' when argument is '-'. -Patch contributed by Josh Rosenberg diff --git a/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst b/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst deleted file mode 100644 index ea469c916b9db..0000000000000 --- a/Misc/NEWS.d/next/Library/2021-12-25-14-13-14.bpo-40296.p0YVGB.rst +++ /dev/null @@ -1 +0,0 @@ -Fix supporting generic aliases in :mod:`pydoc`. diff --git a/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst b/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst deleted file mode 100644 index 03ff27fd7d1a7..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst +++ /dev/null @@ -1,3 +0,0 @@ -Fix a unittest issue where if the command was invoked as ``python -m -unittest`` and the filename(s) began with a dot (.), a ``ValueError`` is -returned. diff --git a/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst b/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst deleted file mode 100644 index c35da6fb47b05..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst +++ /dev/null @@ -1,3 +0,0 @@ -The :mod:`asynchat`, :mod:`asyncore` and :mod:`smtpd` modules have been -deprecated since at least Python 3.6. Their documentation has now been -updated to note they will removed in Python 3.12 (:pep:`594`). diff --git a/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst b/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst deleted file mode 100644 index 40d8504e5a946..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-15-18-32-12.bpo-45997.4n2aVU.rst +++ /dev/null @@ -1 +0,0 @@ -Fix :class:`asyncio.Semaphore` re-aquiring FIFO order. diff --git a/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst b/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst deleted file mode 100644 index c0fd000b2c660..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-16-18-25-19.bpo-2604.jeopdL.rst +++ /dev/null @@ -1 +0,0 @@ -Fix bug where doctests using globals would fail when run multiple times. diff --git a/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst b/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst deleted file mode 100644 index 5445089e53c39..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst +++ /dev/null @@ -1,5 +0,0 @@ -Deprecate the various modules listed by :pep:`594`: - -aifc, asynchat, asyncore, audioop, cgi, cgitb, chunk, crypt, -imghdr, msilib, nntplib, nis, ossaudiodev, pipes, smtpd, -sndhdr, spwd, sunau, telnetlib, uu, xdrlib diff --git a/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst b/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst deleted file mode 100644 index 9285179c9fdca..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst +++ /dev/null @@ -1,2 +0,0 @@ -A warning about inline flags not at the start of the regular expression now -contains the position of the flag. diff --git a/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst b/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst deleted file mode 100644 index d9b57513b0631..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-15-54-41.bpo-38256.FoMbjE.rst +++ /dev/null @@ -1,5 +0,0 @@ -Fix :func:`binascii.crc32` when it is compiled to use zlib'c crc32 to -work properly on inputs 4+GiB in length instead of returning the wrong -result. The workaround prior to this was to always feed the function -data in increments smaller than 4GiB or to just call the zlib module -function. diff --git a/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst b/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst deleted file mode 100644 index 86dc3a0b81b9c..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-19-19-56-04.bpo-42369.Ok828t.rst +++ /dev/null @@ -1 +0,0 @@ -Fix thread safety of :meth:`zipfile._SharedFile.tell` to avoid a "zipfile.BadZipFile: Bad CRC-32 for file" exception when reading a :class:`ZipFile` from multiple threads. diff --git a/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst b/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst deleted file mode 100644 index 053a2b2709ee8..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst +++ /dev/null @@ -1 +0,0 @@ -Protect the :func:`re.finditer` iterator from re-entering. diff --git a/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst deleted file mode 100644 index 1a65024e69fbd..0000000000000 --- a/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst +++ /dev/null @@ -1,4 +0,0 @@ -:const:`hashlib.algorithms_available` now lists only algorithms that are -provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are -not listed unless the legacy provider has been loaded into the default -OSSL context. diff --git a/README.rst b/README.rst index 8856328f9d0bf..d3b2521a875a0 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -This is Python version 3.9.11 +This is Python version 3.9.12 ============================= .. image:: https://travis-ci.org/python/cpython.svg?branch=3.9

1 0

Fix GPG signing in Windows release build (GH-32089)
by zooba March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/366c54633e7d6a4ce94c3f0f80c2abf82a… commit: 366c54633e7d6a4ce94c3f0f80c2abf82a869e15 branch: main author: Steve Dower <steve.dower(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2022-03-23T23:36:26Z summary: Fix GPG signing in Windows release build (GH-32089) files: D .azure-pipelines/windows-release/gpg-sign.yml M .azure-pipelines/windows-release/stage-publish-pythonorg.yml diff --git a/.azure-pipelines/windows-release/gpg-sign.yml b/.azure-pipelines/windows-release/gpg-sign.yml deleted file mode 100644 index 04206d23e4996..0000000000000 --- a/.azure-pipelines/windows-release/gpg-sign.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - GPGKeyFile: $(GPGKey) - GPGPassphrase: $(GPGPassphrase) - Files: '*' - WorkingDirectory: $(Build.BinariesDirectory) - Condition: succeeded() - -steps: -- task: DownloadSecureFile@1 - name: gpgkey - inputs: - secureFile: ${{ parameters.GPGKeyFile }} - condition: ${{ parameters.Condition }} - displayName: 'Download GPG key' - -- powershell: | - git clone https://github.com/python/cpython-bin-deps --branch gpg --single-branch --depth 1 --progress -v "gpg" - gpg/gpg2.exe --import "$(gpgkey.secureFilePath)" - (gci -File ${{ parameters.Files }}).FullName | %{ - gpg/gpg2.exe -ba --batch --passphrase ${{ parameters.GPGPassphrase }} $_ - "Made signature for $_" - } - condition: ${{ parameters.Condition }} - displayName: 'Generate GPG signatures' - workingDirectory: ${{ parameters.WorkingDirectory }} - -- powershell: | - $p = gps "gpg-agent" -EA 0 - if ($p) { $p.Kill() } - displayName: 'Kill GPG agent' - condition: true diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index ee50e4e8aa0db..e8f12b64e5589 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -84,16 +84,32 @@ jobs: condition: and(succeeded(), ne(variables['PublishARM64'], 'true')) - - template: ./gpg-sign.yml - parameters: - GPGKeyFile: 'python-signing.key' - Files: 'msi\*\*, embed\*.zip' - - - template: ./gpg-sign.yml - parameters: - GPGKeyFile: 'python-signing.key' - Files: 'doc\htmlhelp\*.chm' - Condition: and(succeeded(), eq(variables['DoCHM'], 'true')) + - task: DownloadSecureFile@1 + name: gpgkey + inputs: + secureFile: 'python-signing.key' + displayName: 'Download GPG key' + + - powershell: | + git clone https://github.com/python/cpython-bin-deps --branch gpg --single-branch --depth 1 --progress -v "gpg" + gpg/gpg2.exe --import "$(gpgkey.secureFilePath)" + $files = gci -File "msi\*\*", "embed\*.zip" + if ("$(DoCHM)" -ieq "true") { + $files = $files + (gci -File "doc\htmlhelp\*.chm") + } + $files.FullName | %{ + gpg/gpg2.exe -ba --batch --passphrase $(GPGPassphrase) $_ + "Made signature for $_" + } + displayName: 'Generate GPG signatures' + workingDirectory: $(Build.BinariesDirectory) + + - powershell: | + $p = gps "gpg-agent" -EA 0 + if ($p) { $p.Kill() } + displayName: 'Kill GPG agent' + condition: true + - powershell: > $(Build.SourcesDirectory)\Tools\msi\uploadrelease.ps1

1 0

bpo-47104: Rewrite asyncio.to_thread tests to use IsolatedAsyncioTestCase (GH-32086)
by miss-islington March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/9e1bfd8ce79b947dc0c1cfb4644e5afe33… commit: 9e1bfd8ce79b947dc0c1cfb4644e5afe337c2d07 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: 2022-03-23T14:43:32-07:00 summary: bpo-47104: Rewrite asyncio.to_thread tests to use IsolatedAsyncioTestCase (GH-32086) (cherry picked from commit ff619c7dfe8dcb0e4c8dc655abc3acc7dc586d0d) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> files: A Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst M Lib/test/test_asyncio/test_threads.py diff --git a/Lib/test/test_asyncio/test_threads.py b/Lib/test/test_asyncio/test_threads.py index 2af322421dacf..1138a93e0f78e 100644 --- a/Lib/test/test_asyncio/test_threads.py +++ b/Lib/test/test_asyncio/test_threads.py @@ -5,87 +5,58 @@ from contextvars import ContextVar from unittest import mock -from test.test_asyncio import utils as test_utils def tearDownModule(): asyncio.set_event_loop_policy(None) -class ToThreadTests(test_utils.TestCase): - def setUp(self): - super().setUp() - self.loop = asyncio.new_event_loop() - asyncio.set_event_loop(self.loop) - - def tearDown(self): - self.loop.run_until_complete( - self.loop.shutdown_default_executor()) - self.loop.close() - asyncio.set_event_loop(None) - self.loop = None - super().tearDown() - - def test_to_thread(self): - async def main(): - return await asyncio.to_thread(sum, [40, 2]) - - result = self.loop.run_until_complete(main()) +class ToThreadTests(unittest.IsolatedAsyncioTestCase): + async def test_to_thread(self): + result = await asyncio.to_thread(sum, [40, 2]) self.assertEqual(result, 42) - def test_to_thread_exception(self): + async def test_to_thread_exception(self): def raise_runtime(): raise RuntimeError("test") - async def main(): - await asyncio.to_thread(raise_runtime) - with self.assertRaisesRegex(RuntimeError, "test"): - self.loop.run_until_complete(main()) + await asyncio.to_thread(raise_runtime) - def test_to_thread_once(self): + async def test_to_thread_once(self): func = mock.Mock() - async def main(): - await asyncio.to_thread(func) - - self.loop.run_until_complete(main()) + await asyncio.to_thread(func) func.assert_called_once() - def test_to_thread_concurrent(self): + async def test_to_thread_concurrent(self): func = mock.Mock() - async def main(): - futs = [] - for _ in range(10): - fut = asyncio.to_thread(func) - futs.append(fut) - await asyncio.gather(*futs) + futs = [] + for _ in range(10): + fut = asyncio.to_thread(func) + futs.append(fut) + await asyncio.gather(*futs) - self.loop.run_until_complete(main()) self.assertEqual(func.call_count, 10) - def test_to_thread_args_kwargs(self): + async def test_to_thread_args_kwargs(self): # Unlike run_in_executor(), to_thread() should directly accept kwargs. func = mock.Mock() - async def main(): - await asyncio.to_thread(func, 'test', something=True) + await asyncio.to_thread(func, 'test', something=True) - self.loop.run_until_complete(main()) func.assert_called_once_with('test', something=True) - def test_to_thread_contextvars(self): + async def test_to_thread_contextvars(self): test_ctx = ContextVar('test_ctx') def get_ctx(): return test_ctx.get() - async def main(): - test_ctx.set('parrot') - return await asyncio.to_thread(get_ctx) + test_ctx.set('parrot') + result = await asyncio.to_thread(get_ctx) - result = self.loop.run_until_complete(main()) self.assertEqual(result, 'parrot') diff --git a/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst b/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst new file mode 100644 index 0000000000000..1369bc227f5f2 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst @@ -0,0 +1,2 @@ +Rewrite :func:`asyncio.to_thread` tests to use +:class:`unittest.IsolatedAsyncioTestCase`.

1 0

bpo-47104: Rewrite asyncio.to_thread tests to use IsolatedAsyncioTestCase (GH-32086)
by asvetlov March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/ff619c7dfe8dcb0e4c8dc655abc3acc7dc… commit: ff619c7dfe8dcb0e4c8dc655abc3acc7dc586d0d branch: main author: Andrew Svetlov <andrew.svetlov(a)gmail.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2022-03-23T23:17:07+02:00 summary: bpo-47104: Rewrite asyncio.to_thread tests to use IsolatedAsyncioTestCase (GH-32086) files: A Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst M Lib/test/test_asyncio/test_threads.py diff --git a/Lib/test/test_asyncio/test_threads.py b/Lib/test/test_asyncio/test_threads.py index 2af322421dacf..1138a93e0f78e 100644 --- a/Lib/test/test_asyncio/test_threads.py +++ b/Lib/test/test_asyncio/test_threads.py @@ -5,87 +5,58 @@ from contextvars import ContextVar from unittest import mock -from test.test_asyncio import utils as test_utils def tearDownModule(): asyncio.set_event_loop_policy(None) -class ToThreadTests(test_utils.TestCase): - def setUp(self): - super().setUp() - self.loop = asyncio.new_event_loop() - asyncio.set_event_loop(self.loop) - - def tearDown(self): - self.loop.run_until_complete( - self.loop.shutdown_default_executor()) - self.loop.close() - asyncio.set_event_loop(None) - self.loop = None - super().tearDown() - - def test_to_thread(self): - async def main(): - return await asyncio.to_thread(sum, [40, 2]) - - result = self.loop.run_until_complete(main()) +class ToThreadTests(unittest.IsolatedAsyncioTestCase): + async def test_to_thread(self): + result = await asyncio.to_thread(sum, [40, 2]) self.assertEqual(result, 42) - def test_to_thread_exception(self): + async def test_to_thread_exception(self): def raise_runtime(): raise RuntimeError("test") - async def main(): - await asyncio.to_thread(raise_runtime) - with self.assertRaisesRegex(RuntimeError, "test"): - self.loop.run_until_complete(main()) + await asyncio.to_thread(raise_runtime) - def test_to_thread_once(self): + async def test_to_thread_once(self): func = mock.Mock() - async def main(): - await asyncio.to_thread(func) - - self.loop.run_until_complete(main()) + await asyncio.to_thread(func) func.assert_called_once() - def test_to_thread_concurrent(self): + async def test_to_thread_concurrent(self): func = mock.Mock() - async def main(): - futs = [] - for _ in range(10): - fut = asyncio.to_thread(func) - futs.append(fut) - await asyncio.gather(*futs) + futs = [] + for _ in range(10): + fut = asyncio.to_thread(func) + futs.append(fut) + await asyncio.gather(*futs) - self.loop.run_until_complete(main()) self.assertEqual(func.call_count, 10) - def test_to_thread_args_kwargs(self): + async def test_to_thread_args_kwargs(self): # Unlike run_in_executor(), to_thread() should directly accept kwargs. func = mock.Mock() - async def main(): - await asyncio.to_thread(func, 'test', something=True) + await asyncio.to_thread(func, 'test', something=True) - self.loop.run_until_complete(main()) func.assert_called_once_with('test', something=True) - def test_to_thread_contextvars(self): + async def test_to_thread_contextvars(self): test_ctx = ContextVar('test_ctx') def get_ctx(): return test_ctx.get() - async def main(): - test_ctx.set('parrot') - return await asyncio.to_thread(get_ctx) + test_ctx.set('parrot') + result = await asyncio.to_thread(get_ctx) - result = self.loop.run_until_complete(main()) self.assertEqual(result, 'parrot') diff --git a/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst b/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst new file mode 100644 index 0000000000000..1369bc227f5f2 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-03-23-22-45-51.bpo-47104._esUq8.rst @@ -0,0 +1,2 @@ +Rewrite :func:`asyncio.to_thread` tests to use +:class:`unittest.IsolatedAsyncioTestCase`.

1 0

[3.10] bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076) (GH-32085)
by tiran March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/1b6acaad9a18b2498386c60f24351ab749… commit: 1b6acaad9a18b2498386c60f24351ab749061e3a branch: 3.10 author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-03-23T22:15:25+01:00 summary: [3.10] bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076) (GH-32085) Co-authored-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst M Lib/test/test_hashlib.py M Modules/_hashopenssl.c diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index ea31f8be2cb82..535f4aa3e04ca 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -221,6 +221,10 @@ def test_algorithms_guaranteed(self): def test_algorithms_available(self): self.assertTrue(set(hashlib.algorithms_guaranteed). issubset(hashlib.algorithms_available)) + # all available algorithms must be loadable, bpo-47101 + self.assertNotIn("undefined", hashlib.algorithms_available) + for name in hashlib.algorithms_available: + digest = hashlib.new(name, usedforsecurity=False) def test_usedforsecurity_true(self): hashlib.new("sha256", usedforsecurity=True) diff --git a/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst new file mode 100644 index 0000000000000..1a65024e69fbd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst @@ -0,0 +1,4 @@ +:const:`hashlib.algorithms_available` now lists only algorithms that are +provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are +not listed unless the legacy provider has been loaded into the default +OSSL context. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 65538f63f7bf4..75063fa15369a 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -1836,15 +1836,21 @@ typedef struct _internal_name_mapper_state { /* A callback function to pass to OpenSSL's OBJ_NAME_do_all(...) */ static void +#if OPENSSL_VERSION_NUMBER >= 0x30000000L +_openssl_hash_name_mapper(EVP_MD *md, void *arg) +#else _openssl_hash_name_mapper(const EVP_MD *md, const char *from, const char *to, void *arg) +#endif { _InternalNameMapperState *state = (_InternalNameMapperState *)arg; PyObject *py_name; assert(state != NULL); - if (md == NULL) + // ignore all undefined providers + if ((md == NULL) || (EVP_MD_nid(md) == NID_undef)) { return; + } py_name = py_digest_name(md); if (py_name == NULL) { @@ -1870,7 +1876,12 @@ hashlib_md_meth_names(PyObject *module) return -1; } +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + // get algorithms from all activated providers in default context + EVP_MD_do_all_provided(NULL, &_openssl_hash_name_mapper, &state); +#else EVP_MD_do_all(&_openssl_hash_name_mapper, &state); +#endif if (state.error) { Py_DECREF(state.set);

1 0

bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076)
by miss-islington March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/ec3589f59d2c8456591f33656639bcc303… commit: ec3589f59d2c8456591f33656639bcc303eb7bd5 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-03-23T13:58:02-07:00 summary: bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076) (cherry picked from commit 48e2010d92076b472922fa632fffc98ee150004f) Co-authored-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst M Lib/test/test_hashlib.py M Modules/_hashopenssl.c diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 214bc3cb2b187..f845c7a76e7cb 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -223,6 +223,10 @@ def test_algorithms_guaranteed(self): def test_algorithms_available(self): self.assertTrue(set(hashlib.algorithms_guaranteed). issubset(hashlib.algorithms_available)) + # all available algorithms must be loadable, bpo-47101 + self.assertNotIn("undefined", hashlib.algorithms_available) + for name in hashlib.algorithms_available: + digest = hashlib.new(name, usedforsecurity=False) def test_usedforsecurity_true(self): hashlib.new("sha256", usedforsecurity=True) diff --git a/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst new file mode 100644 index 0000000000000..1a65024e69fbd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst @@ -0,0 +1,4 @@ +:const:`hashlib.algorithms_available` now lists only algorithms that are +provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are +not listed unless the legacy provider has been loaded into the default +OSSL context. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 4873bb11aa0cd..4db058c06275f 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -1860,15 +1860,21 @@ typedef struct _internal_name_mapper_state { /* A callback function to pass to OpenSSL's OBJ_NAME_do_all(...) */ static void +#if OPENSSL_VERSION_NUMBER >= 0x30000000L +_openssl_hash_name_mapper(EVP_MD *md, void *arg) +#else _openssl_hash_name_mapper(const EVP_MD *md, const char *from, const char *to, void *arg) +#endif { _InternalNameMapperState *state = (_InternalNameMapperState *)arg; PyObject *py_name; assert(state != NULL); - if (md == NULL) + // ignore all undefined providers + if ((md == NULL) || (EVP_MD_nid(md) == NID_undef)) { return; + } py_name = py_digest_name(md); if (py_name == NULL) { @@ -1894,7 +1900,12 @@ hashlib_md_meth_names(PyObject *module) return -1; } +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + // get algorithms from all activated providers in default context + EVP_MD_do_all_provided(NULL, &_openssl_hash_name_mapper, &state); +#else EVP_MD_do_all(&_openssl_hash_name_mapper, &state); +#endif if (state.error) { Py_DECREF(state.set);

1 0

bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076)
by miss-islington March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/48e2010d92076b472922fa632fffc98ee1… commit: 48e2010d92076b472922fa632fffc98ee150004f branch: main author: Christian Heimes <christian(a)python.org> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-03-23T13:30:05-07:00 summary: bpo-47101: list only activated algorithms in hashlib.algorithms_available (GH-32076) files: A Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst M Lib/test/test_hashlib.py M Modules/_hashopenssl.c diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 369bbde6e78b6..d2a92147d5f02 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -223,6 +223,10 @@ def test_algorithms_guaranteed(self): def test_algorithms_available(self): self.assertTrue(set(hashlib.algorithms_guaranteed). issubset(hashlib.algorithms_available)) + # all available algorithms must be loadable, bpo-47101 + self.assertNotIn("undefined", hashlib.algorithms_available) + for name in hashlib.algorithms_available: + digest = hashlib.new(name, usedforsecurity=False) def test_usedforsecurity_true(self): hashlib.new("sha256", usedforsecurity=True) diff --git a/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst new file mode 100644 index 0000000000000..1a65024e69fbd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-23-15-31-02.bpo-47101.rVSld-.rst @@ -0,0 +1,4 @@ +:const:`hashlib.algorithms_available` now lists only algorithms that are +provided by activated crypto providers on OpenSSL 3.0. Legacy algorithms are +not listed unless the legacy provider has been loaded into the default +OSSL context. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index bb9487204e741..203366e380d4e 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -1836,15 +1836,21 @@ typedef struct _internal_name_mapper_state { /* A callback function to pass to OpenSSL's OBJ_NAME_do_all(...) */ static void +#if OPENSSL_VERSION_NUMBER >= 0x30000000L +_openssl_hash_name_mapper(EVP_MD *md, void *arg) +#else _openssl_hash_name_mapper(const EVP_MD *md, const char *from, const char *to, void *arg) +#endif { _InternalNameMapperState *state = (_InternalNameMapperState *)arg; PyObject *py_name; assert(state != NULL); - if (md == NULL) + // ignore all undefined providers + if ((md == NULL) || (EVP_MD_nid(md) == NID_undef)) { return; + } py_name = py_digest_name(md); if (py_name == NULL) { @@ -1870,7 +1876,12 @@ hashlib_md_meth_names(PyObject *module) return -1; } +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + // get algorithms from all activated providers in default context + EVP_MD_do_all_provided(NULL, &_openssl_hash_name_mapper, &state); +#else EVP_MD_do_all(&_openssl_hash_name_mapper, &state); +#endif if (state.error) { Py_DECREF(state.set);

1 0

[3.9] bpo-47061: document module deprecations due to PEP 594 (GH-31984) (GH-32082)
by miss-islington March 23, 2022

March 23, 2022

https://github.com/python/cpython/commit/e513b8188af4d2f43ab2b96b51bc45bd4f… commit: e513b8188af4d2f43ab2b96b51bc45bd4f6fd5b6 branch: 3.9 author: Hugo van Kemenade <hugovk(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-03-23T13:13:08-07:00 summary: [3.9] bpo-47061: document module deprecations due to PEP 594 (GH-31984) (GH-32082) Also removed asynchat, asyncore, and smtpd from their respective toctree entries so they are only in the superceded subtree. (cherry picked from commit 9ac2de922a0f783bd43b8e026e4fb70fd1888572) Co-authored-by: Brett Cannon <brett(a)python.org> Automerge-Triggered-By: GH:brettcannon files: A Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst M Doc/library/aifc.rst M Doc/library/audioop.rst M Doc/library/cgi.rst M Doc/library/cgitb.rst M Doc/library/chunk.rst M Doc/library/crypt.rst M Doc/library/fileformats.rst M Doc/library/imghdr.rst M Doc/library/internet.rst M Doc/library/ipc.rst M Doc/library/mm.rst M Doc/library/msilib.rst M Doc/library/netdata.rst M Doc/library/nis.rst M Doc/library/nntplib.rst M Doc/library/ossaudiodev.rst M Doc/library/pipes.rst M Doc/library/sndhdr.rst M Doc/library/spwd.rst M Doc/library/sunau.rst M Doc/library/superseded.rst M Doc/library/telnetlib.rst M Doc/library/unix.rst M Doc/library/uu.rst M Doc/library/windows.rst M Doc/library/xdrlib.rst diff --git a/Doc/library/aifc.rst b/Doc/library/aifc.rst index 2e917cf7321b8..edb4bf86e5a0a 100644 --- a/Doc/library/aifc.rst +++ b/Doc/library/aifc.rst @@ -3,6 +3,7 @@ .. module:: aifc :synopsis: Read and write audio files in AIFF or AIFC format. + :deprecated: **Source code:** :source:`Lib/aifc.py` @@ -11,6 +12,10 @@ single: AIFF single: AIFF-C + +.. deprecated:: 3.11 + The :mod:`aifc` module is deprecated (see :pep:`594` for details). + -------------- This module provides support for reading and writing AIFF and AIFF-C files. diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst index bad9da2ec62e5..eae206084f090 100644 --- a/Doc/library/audioop.rst +++ b/Doc/library/audioop.rst @@ -3,6 +3,10 @@ .. module:: audioop :synopsis: Manipulate raw audio data. + :deprecated: + +.. deprecated:: 3.11 + The :mod:`audioop` module is deprecated (see :pep:`594` for details). -------------- diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst index 3ec919e9ccd00..80c4d8033130c 100644 --- a/Doc/library/cgi.rst +++ b/Doc/library/cgi.rst @@ -3,6 +3,7 @@ .. module:: cgi :synopsis: Helpers for running Python scripts via the Common Gateway Interface. + :deprecated: **Source code:** :source:`Lib/cgi.py` @@ -14,6 +15,9 @@ single: URL single: Common Gateway Interface +.. deprecated:: 3.11 + The :mod:`cgi` module is deprecated (see :pep:`594` for details). + -------------- Support module for Common Gateway Interface (CGI) scripts. diff --git a/Doc/library/cgitb.rst b/Doc/library/cgitb.rst index 5f3a6476dd8cd..349414610bd40 100644 --- a/Doc/library/cgitb.rst +++ b/Doc/library/cgitb.rst @@ -3,6 +3,7 @@ .. module:: cgitb :synopsis: Configurable traceback handler for CGI scripts. + :deprecated: .. moduleauthor:: Ka-Ping Yee <ping(a)lfw.org> .. sectionauthor:: Fred L. Drake, Jr. <fdrake(a)acm.org> @@ -15,6 +16,9 @@ single: exceptions; in CGI scripts single: tracebacks; in CGI scripts +.. deprecated:: 3.11 + The :mod:`cgitb` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`cgitb` module provides a special exception handler for Python scripts. diff --git a/Doc/library/chunk.rst b/Doc/library/chunk.rst index 5e24df923ed21..7999420f536d7 100644 --- a/Doc/library/chunk.rst +++ b/Doc/library/chunk.rst @@ -3,6 +3,7 @@ .. module:: chunk :synopsis: Module to read IFF chunks. + :deprecated: .. moduleauthor:: Sjoerd Mullender <sjoerd(a)acm.org> .. sectionauthor:: Sjoerd Mullender <sjoerd(a)acm.org> @@ -16,6 +17,9 @@ single: Real Media File Format single: RMFF +.. deprecated:: 3.11 + The :mod:`chunk` module is deprecated (see :pep:`594` for details). + -------------- This module provides an interface for reading files that use EA IFF 85 chunks. diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst index d25c626a17585..73df87ca0db8d 100644 --- a/Doc/library/crypt.rst +++ b/Doc/library/crypt.rst @@ -4,6 +4,7 @@ .. module:: crypt :platform: Unix :synopsis: The crypt() function used to check Unix passwords. + :deprecated: .. moduleauthor:: Steven D. Majewski <sdm7g(a)virginia.edu> .. sectionauthor:: Steven D. Majewski <sdm7g(a)virginia.edu> @@ -15,6 +16,9 @@ single: crypt(3) pair: cipher; DES +.. deprecated:: 3.11 + The :mod:`crypt` module is deprecated (see :pep:`594` for details). + -------------- This module implements an interface to the :manpage:`crypt(3)` routine, which is diff --git a/Doc/library/fileformats.rst b/Doc/library/fileformats.rst index e9c2e1fbbdf3e..7b33b3364572d 100644 --- a/Doc/library/fileformats.rst +++ b/Doc/library/fileformats.rst @@ -13,5 +13,4 @@ that aren't markup languages and are not related to e-mail. csv.rst configparser.rst netrc.rst - xdrlib.rst plistlib.rst diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst index 800e919599d9c..f63a0fa56fd26 100644 --- a/Doc/library/imghdr.rst +++ b/Doc/library/imghdr.rst @@ -3,9 +3,13 @@ .. module:: imghdr :synopsis: Determine the type of image contained in a file or byte stream. + :deprecated: **Source code:** :source:`Lib/imghdr.py` +.. deprecated:: 3.11 + The :mod:`imghdr` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`imghdr` module determines the type of image contained in a file or diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst index b8950bb6cb8c2..c8bab2a5836ad 100644 --- a/Doc/library/internet.rst +++ b/Doc/library/internet.rst @@ -20,8 +20,6 @@ is currently supported on most popular platforms. Here is an overview: .. toctree:: webbrowser.rst - cgi.rst - cgitb.rst wsgiref.rst urllib.rst urllib.request.rst @@ -33,10 +31,7 @@ is currently supported on most popular platforms. Here is an overview: ftplib.rst poplib.rst imaplib.rst - nntplib.rst smtplib.rst - smtpd.rst - telnetlib.rst uuid.rst socketserver.rst http.server.rst diff --git a/Doc/library/ipc.rst b/Doc/library/ipc.rst index b88a174eb97f1..4849c82f317d9 100644 --- a/Doc/library/ipc.rst +++ b/Doc/library/ipc.rst @@ -22,7 +22,5 @@ The list of modules described in this chapter is: ssl.rst select.rst selectors.rst - asyncore.rst - asynchat.rst signal.rst mmap.rst diff --git a/Doc/library/mm.rst b/Doc/library/mm.rst index c8f79c4de1cdf..cd06e9385a261 100644 --- a/Doc/library/mm.rst +++ b/Doc/library/mm.rst @@ -11,12 +11,5 @@ discretion of the installation. Here's an overview: .. toctree:: - audioop.rst - aifc.rst - sunau.rst wave.rst - chunk.rst colorsys.rst - imghdr.rst - sndhdr.rst - ossaudiodev.rst diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst index 83b3d4973bf0d..5ce18a1f75fc2 100644 --- a/Doc/library/msilib.rst +++ b/Doc/library/msilib.rst @@ -4,6 +4,7 @@ .. module:: msilib :platform: Windows :synopsis: Creation of Microsoft Installer files, and CAB files. + :deprecated: .. moduleauthor:: Martin v. Löwis <martin(a)v.loewis.de> .. sectionauthor:: Martin v. Löwis <martin(a)v.loewis.de> @@ -12,6 +13,9 @@ .. index:: single: msi +.. deprecated:: 3.11 + The :mod:`msilib` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`msilib` supports the creation of Microsoft Installer (``.msi``) files. diff --git a/Doc/library/netdata.rst b/Doc/library/netdata.rst index 491501665e3d7..8a3ad68753a53 100644 --- a/Doc/library/netdata.rst +++ b/Doc/library/netdata.rst @@ -20,4 +20,3 @@ on the Internet. binhex.rst binascii.rst quopri.rst - uu.rst diff --git a/Doc/library/nis.rst b/Doc/library/nis.rst index 10c67cbb81b2f..f6b6ea83946b0 100644 --- a/Doc/library/nis.rst +++ b/Doc/library/nis.rst @@ -5,10 +5,14 @@ .. module:: nis :platform: Unix :synopsis: Interface to Sun's NIS (Yellow Pages) library. + :deprecated: .. moduleauthor:: Fred Gansevles <Fred.Gansevles(a)cs.utwente.nl> .. sectionauthor:: Moshe Zadka <moshez(a)zadka.site.co.il> +.. deprecated:: 3.11 + The :mod:`nis` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`nis` module gives a thin wrapper around the NIS library, useful for diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst index e7ec9047e015e..2a996e451bf7c 100644 --- a/Doc/library/nntplib.rst +++ b/Doc/library/nntplib.rst @@ -3,6 +3,7 @@ .. module:: nntplib :synopsis: NNTP protocol client (requires sockets). + :deprecated: **Source code:** :source:`Lib/nntplib.py` @@ -10,6 +11,9 @@ pair: NNTP; protocol single: Network News Transfer Protocol +.. deprecated:: 3.11 + The :mod:`nntplib` module is deprecated (see :pep:`594` for details). + -------------- This module defines the class :class:`NNTP` which implements the client side of diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst index a7d3dac363cdf..e0f0a6b8259e4 100644 --- a/Doc/library/ossaudiodev.rst +++ b/Doc/library/ossaudiodev.rst @@ -4,6 +4,10 @@ .. module:: ossaudiodev :platform: Linux, FreeBSD :synopsis: Access to OSS-compatible audio devices. + :deprecated: + +.. deprecated:: 3.11 + The :mod:`ossaudiodev` module is deprecated (see :pep:`594` for details). -------------- diff --git a/Doc/library/pipes.rst b/Doc/library/pipes.rst index 0a22da1f555bc..25f808566ecf9 100644 --- a/Doc/library/pipes.rst +++ b/Doc/library/pipes.rst @@ -4,11 +4,15 @@ .. module:: pipes :platform: Unix :synopsis: A Python interface to Unix shell pipelines. + :deprecated: .. sectionauthor:: Moshe Zadka <moshez(a)zadka.site.co.il> **Source code:** :source:`Lib/pipes.py` +.. deprecated:: 3.11 + The :mod:`pipes` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`pipes` module defines a class to abstract the concept of a *pipeline* diff --git a/Doc/library/sndhdr.rst b/Doc/library/sndhdr.rst index 6bfa9a9fd210b..41bce18b9cd84 100644 --- a/Doc/library/sndhdr.rst +++ b/Doc/library/sndhdr.rst @@ -3,6 +3,7 @@ .. module:: sndhdr :synopsis: Determine type of a sound file. + :deprecated: .. sectionauthor:: Fred L. Drake, Jr. <fdrake(a)acm.org> .. Based on comments in the module source file. @@ -13,6 +14,9 @@ single: A-LAW single: u-LAW +.. deprecated:: 3.11 + The :mod:`sndhdr` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`sndhdr` provides utility functions which attempt to determine the type diff --git a/Doc/library/spwd.rst b/Doc/library/spwd.rst index c6cad2a3c3284..cb31a10a52e00 100644 --- a/Doc/library/spwd.rst +++ b/Doc/library/spwd.rst @@ -4,6 +4,10 @@ .. module:: spwd :platform: Unix :synopsis: The shadow password database (getspnam() and friends). + :deprecated: + +.. deprecated:: 3.11 + The :mod:`spwd` module is deprecated (see :pep:`594` for details). -------------- diff --git a/Doc/library/sunau.rst b/Doc/library/sunau.rst index aad6f93b6bff1..cfb1257f58548 100644 --- a/Doc/library/sunau.rst +++ b/Doc/library/sunau.rst @@ -3,11 +3,15 @@ .. module:: sunau :synopsis: Provide an interface to the Sun AU sound format. + :deprecated: .. sectionauthor:: Moshe Zadka <moshez(a)zadka.site.co.il> **Source code:** :source:`Lib/sunau.py` +.. deprecated:: 3.11 + The :mod:`sunau` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`sunau` module provides a convenient interface to the Sun AU sound diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst index fd23e4d1536d3..e3f9b0d37fe10 100644 --- a/Doc/library/superseded.rst +++ b/Doc/library/superseded.rst @@ -10,8 +10,26 @@ backwards compatibility. They have been superseded by other modules. .. toctree:: + aifc.rst asynchat.rst asyncore.rst - smtpd.rst + audioop.rst + cgi.rst + cgitb.rst + chunk.rst + crypt.rst + imghdr.rst imp.rst + msilib.rst + nntplib.rst + nis.rst optparse.rst + ossaudiodev.rst + pipes.rst + smtpd.rst + sndhdr.rst + spwd.rst + sunau.rst + telnetlib.rst + uu.rst + xdrlib.rst diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst index 48a9aea50dddd..97b0a713e4422 100644 --- a/Doc/library/telnetlib.rst +++ b/Doc/library/telnetlib.rst @@ -3,6 +3,7 @@ .. module:: telnetlib :synopsis: Telnet client class. + :deprecated: .. sectionauthor:: Skip Montanaro <skip(a)pobox.com> @@ -10,6 +11,9 @@ .. index:: single: protocol; Telnet +.. deprecated:: 3.11 + The :mod:`telnetlib` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`telnetlib` module provides a :class:`Telnet` class that implements the diff --git a/Doc/library/unix.rst b/Doc/library/unix.rst index 04d4081f4a073..4553a104d15a2 100644 --- a/Doc/library/unix.rst +++ b/Doc/library/unix.rst @@ -13,14 +13,10 @@ of it. Here's an overview: posix.rst pwd.rst - spwd.rst grp.rst - crypt.rst termios.rst tty.rst pty.rst fcntl.rst - pipes.rst resource.rst - nis.rst syslog.rst diff --git a/Doc/library/uu.rst b/Doc/library/uu.rst index 0bc8021e1bdfc..c341bc83dcfed 100644 --- a/Doc/library/uu.rst +++ b/Doc/library/uu.rst @@ -3,11 +3,15 @@ .. module:: uu :synopsis: Encode and decode files in uuencode format. + :deprecated: .. moduleauthor:: Lance Ellinghouse **Source code:** :source:`Lib/uu.py` +.. deprecated:: 3.11 + The :mod:`uu` module is deprecated (see :pep:`594` for details). + -------------- This module encodes and decodes files in uuencode format, allowing arbitrary diff --git a/Doc/library/windows.rst b/Doc/library/windows.rst index b60d4e4ccf51d..4d72ead12aadc 100644 --- a/Doc/library/windows.rst +++ b/Doc/library/windows.rst @@ -9,7 +9,6 @@ This chapter describes modules that are only available on MS Windows platforms. .. toctree:: - msilib.rst msvcrt.rst winreg.rst winsound.rst diff --git a/Doc/library/xdrlib.rst b/Doc/library/xdrlib.rst index 42a03a46754d0..060b2e2c60df6 100644 --- a/Doc/library/xdrlib.rst +++ b/Doc/library/xdrlib.rst @@ -3,6 +3,7 @@ .. module:: xdrlib :synopsis: Encoders and decoders for the External Data Representation (XDR). + :deprecated: **Source code:** :source:`Lib/xdrlib.py` @@ -10,6 +11,9 @@ single: XDR single: External Data Representation +.. deprecated:: 3.11 + The :mod:`xdrlib` module is deprecated (see :pep:`594` for details). + -------------- The :mod:`xdrlib` module supports the External Data Representation Standard as diff --git a/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst b/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst new file mode 100644 index 0000000000000..5445089e53c39 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-18-13-30-40.bpo-47061.etLHK5.rst @@ -0,0 +1,5 @@ +Deprecate the various modules listed by :pep:`594`: + +aifc, asynchat, asyncore, audioop, cgi, cgitb, chunk, crypt, +imghdr, msilib, nntplib, nis, ossaudiodev, pipes, smtpd, +sndhdr, spwd, sunau, telnetlib, uu, xdrlib

1 0