macOS releases numbering has changed as of macOS 11 Big Sur.  Previously, major releases were of the form 10.x, 10.x+1, 10.x+2, etc; as of Big Sur, they are now x, x+1, etc, so, for example, 10.15, 10.15.1, ..., 10.15.7, 11, 11.0.1, 11.1, ..., 12, 12.1, etc. Allow Python to build with single-digit deployment target values. Patch provided by FX Coudert.
(cherry picked from commit 5291639)

Co-authored-by: FX Coudert <fxcoudert@gmail.com>

pythonGH-23612)

(cherry picked from commit f3c3ea9)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Fix test_asyncio.test_call_later() race condition: don't measure
asyncio performance in the call_later() unit test. The test failed
randomly on the CI.
(cherry picked from commit 7e5e13d)

Co-authored-by: Victor Stinner <vstinner@python.org>

…nGH-23603)

(cherry picked from commit db68544)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

https://bugzilla.redhat.com/show_bug.cgi?id=1866884 is fixed in gdb
10.1 (failed to reproduce on gdb-10.1-1.fc34.aarch64).
(cherry picked from commit 0663940)

Co-authored-by: Victor Stinner <vstinner@python.org>

…nGH-23630)

(cherry picked from commit 6e1eec7)

Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>

…ption (pythonGH-23531) (pythonGH-23578)

(cherry picked from commit 427613f)


Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>

…t of range (pythonGH-23633)

This can happen when a file was edited after it was imported.
(cherry picked from commit 2e0760b)

Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>

…nGH-23649) (pythonGH-23650)

If no explicit macOS SDK was specified, setup.py should check for
Tcl and TK frameworks in /Library/Frameworks; the previous commit
inadvertently broke that test.
(cherry picked from commit 29afab6)

Co-authored-by: Ned Deily <nad@python.org>

…y parsed (pythonGH-23638) (pythonGH-23657)

(cherry picked from commit da3d2ab)


Co-authored-by: Senthil Kumaran <senthil@uthcode.com>

Automerge-Triggered-By: GH:orsenthil

…icAlias (pythonGH-23656)

Use `_PyArg_NoKeywords` instead of `_PyArg_NoKwnames` when checking the `kwds` tuple when creating `GenericAlias`. This fixes an interpreter crash when passing in keyword arguments to `GenericAlias`'s constructor.

Needs backport to 3.9.

Automerge-Triggered-By: GH:gvanrossum
(cherry picked from commit 804d689)

Co-authored-by: kj <28750310+Fidget-Spinner@users.noreply.github.com>

…onGH-23663) (pythonGH-23666)

(cherry picked from commit 6a7fb9d)


Co-authored-by: kj <28750310+Fidget-Spinner@users.noreply.github.com>

Automerge-Triggered-By: GH:gvanrossum

Remove obsolete workaround that prevented running files with
shortcuts when using new universal2 installers built on macOS 11.
Ignore buggy 2nd run_module_event call.
(cherry picked from commit 57e5113)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

… set (pythonGH-23653) (python#23668)

(cherry picked from commit 752cdf2)

Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>

Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>

… match distutils (pythonGH-22088)

(cherry picked from commit c0afb7f)

Co-authored-by: Matti Picus <matti.picus@gmail.com>

Several built-in and standard library types now ensure that their internal result tuples are always tracked by the garbage collector:

- collections.OrderedDict.items
- dict.items
- enumerate
- functools.reduce
- itertools.combinations
- itertools.combinations_with_replacement
- itertools.permutations
- itertools.product
- itertools.zip_longest
- zip

Previously, they could have become untracked by a prior garbage collection.
(cherry picked from commit 226a012)

pythonGH-23673)

(cherry picked from commit c266736)

Python 3.9.1

…ythonGH-23692)

Fix encoding name when running a ".pyc" file on Windows:
PyRun_SimpleFileExFlags() now uses the correct encoding to decode the
filename.

* Add pyrun_file() subfunction.
* Add pyrun_simple_file() subfunction.
* PyRun_SimpleFileExFlags() now calls _Py_fopen_obj() rather than
  _Py_fopen().

(cherry picked from commit b6d98c1)

…ythonGH-23703)

(cherry picked from commit 37440ee)

…-23707)

* [3.9] [Enum] reformat and add doc strings (pythonGH-23705).

…lt value pythonGH-23732

(cherry picked from commit 2a35137)

Co-authored-by: Andre Delfino <adelfino@gmail.com>

…H-23548) (pythonGH-23749)

Fix the wording in the documentation of `async for` to correctly describe asynchronous iterables.  This fix is relevant for version 3.7 onward.
(cherry picked from commit 4b8cdfc)


Co-authored-by: Nick Gaya <nicholasgaya+github@gmail.com>

…23690) (pythonGH-23756)

This is invalid in C99 and later and is an error with some compilers
(e.g. clang in Xcode 12), and can thus cause configure checks to
produce incorrect results.
(cherry picked from commit 674fa0a)

Co-authored-by: Joshua Root <jmr@macports.org>

…ead of call its __bool__ function (pythonGH-23613) (pythonGH-23676)

Check if NonCallableMock's spec_arg is not None instead of call its __bool__ function
(cherry picked from commit c598a04)

Co-authored-by: idanw206 <31290383+idanw206@users.noreply.github.com>

…ions.abc and typing (pythonGH-23765)

Backport of pythonGH-23060.

…cs. (pythonGH-24787) (pythonGH-24849)

pythonGH-24836) (pythonGH-24855)

* [3.9] bpo-43439: Wrapt the tuple in the audit events for the gc module (pythonGH-24836).
(cherry picked from commit 9c376bc)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

* Update gcmodule.c

* Update gcmodule.c

* Update gcmodule.c

(cherry picked from commit 06e3a27)

Co-authored-by: Ammar Askar <ammar@ammaraskar.com>

Answer "Why is there no goto?" in the Design and History FAQ.
(cherry picked from commit 5e29021)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

…) (pythonGH-24835)

(cherry picked from commit 35cacce)

Automerge-Triggered-By: GH:Mariatta
(cherry picked from commit 93d33b4)

Co-authored-by: Kazantcev Andrey <45011689+heckad@users.noreply.github.com>

bpo-43285: Make ftplib not trust the PASV response.

The IPv4 address value returned from the server in response to the PASV command
should not be trusted.  This prevents a malicious FTP server from using the
response to probe IPv4 address and port combinations on the client network.

Instead of using the returned address, we use the IP address we're
already connected to.  This is the strategy other ftp clients adopted,
and matches the only strategy available for the modern IPv6 EPSV command
where the server response must return a port number and nothing else.

For the rare user who _wants_ this ugly behavior, set a `trust_server_pasv_ipv4_address`
attribute on your `ftplib.FTP` instance to True.
(cherry picked from commit 0ab152c)

Co-authored-by: Gregory P. Smith <greg@krypto.org>

Covers the ftplib security fix.

…ythonGH-24885)

See PEP 624.
(cherry picked from commit 1330338)

Co-authored-by: Inada Naoki <songofacandy@gmail.com>

…ows (pythonGH-24873)

) (pythonGH-24894)

Fix warning:

Objects\exceptions.c(2324,56): warning C4098:
'MemoryError_dealloc': 'void' function returning a value
(cherry picked from commit bbeb223)

Co-authored-by: Victor Stinner <vstinner@python.org>

Co-authored-by: Victor Stinner <vstinner@python.org>

…ythonGH-20628) (pythonGH-24896)

(cherry picked from commit 3b3b83c)

…onGH-24843)

Python no longer fails at startup with a fatal error if a command
line argument contains an invalid Unicode character.

The Py_DecodeLocale() function now escapes byte sequences which would
be decoded as Unicode characters outside the [U+0000; U+10ffff]
range.

Use MAX_UNICODE constant in unicodeobject.c.
(cherry picked from commit 9976834)

Co-authored-by: Victor Stinner <vstinner@python.org>

…H-24511)

(cherry picked from commit 813db24)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

…H-24915)

Ubuntu 20.04 comes with a patched OpenSSL 1.1.1. Default security level
2 blocks TLS 1.0 and 1.1 connections. Regular OpenSSL 1.1.1 builds allow
TLS 1.0 and 1.1 on security level 2.

See:
See: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/1899878
See: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/1917625
Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit f6c6b58)

Co-authored-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit 08ff436)

Co-authored-by: Kodi Arfer <Kodiologist@users.noreply.github.com>

…ythonGH-24895) (pythonGH-24948)

(cherry picked from commit 2fd16ef)

Co-authored-by: Antoine Pitrou <antoine@python.org>

Automerge-Triggered-By: GH:pitrou

…GH-24950) (pythonGH-24951)

Should fix some CI failures on buildbots that test an installed version of Python.


(cherry picked from commit 66c8adf)

Co-authored-by: Antoine Pitrou <antoine@python.org>

pythonGH-24957)

OpenSSL copies the internal message callback from SSL_CTX->msg_callback to
SSL->msg_callback. SSL_set_SSL_CTX() does not update SSL->msg_callback
to use the callback value of the new context.

PySSL_set_context() now resets the callback and _PySSL_msg_callback()
resets thread state in error path.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 77cde50)

Co-authored-by: Christian Heimes <christian@python.org>

…racter (pythonGH-24939) (python#24975)

(cherry picked from commit 96eeff5)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

(cherry picked from commit 76b5d71)

Co-authored-by: Brett Cannon <brett@python.org>

…thon#24994)

(cherry picked from commit 76b5d71)

Co-authored-by: Brett Cannon <brett@python.org>

(cherry picked from commit b045cda)

Co-authored-by: Inada Naoki <songofacandy@gmail.com>