bpo-43534: Make dialogs in turtle.textinput() and turtle.numinput() transitient again (GH-24923)

(cherry picked from commit b5adc8a7e5c13d175b4d3e53b37bc61de35b1457)

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

[3.9] bpo-43930: Update bundled pip to 21.1 and setuptools to 56.0.0 (GH-25578)

(cherry picked from commit 196983563d05e32d2dcf217e955a919f9e0c25e1)

bpo-43284: Update platform.win32_ver to use _syscmd_ver instead of sys.getwindowsversion() (GH-25500)

The sys module uses the kernel32.dll version number, which can vary from the "actual" Windows version.
Since the best option for getting the version is WMI (which is expensive), we switch back to launching cmd.exe (which is also expensive, but a lot less code on our part).
sys.getwindowsversion() is not updated to avoid launching executables from that module.
(cherry picked from commit 2a3f4899c63806439e5bcea0c30f7e6a6295a763)

Co-authored-by: Shreyan Avigyan <shreyan.avigyan@gmail.com>

bpo-43607: Fix urllib handling of Windows paths with \\?\ prefix (GH-25539)

(cherry picked from commit 3513d55a617012002c3f82dbf3cec7ec1abd7090)

Co-authored-by: Steve Dower <steve.dower@python.org>

[3.9] bpo-43920: Make load_verify_locations(cadata) error message consistent (GH-25554) (GH-25555)

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

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

bpo-43856: Add a versionadded directive to the importlib.metadata docs (GH-25445)

Use a versionadded directive to generate the text "New in version
3.8." (to match with the documentation of other modules).

Automerge-Triggered-By: GH:jaraco.
(cherry picked from commit adf24bd835ed8f76dcc51aa98c8c54275e86965b)

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

Reformat idlelib colorizer (GH-25479)

Also replace if-then and and-or with conditional expressions.

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
(cherry picked from commit 702a0885ba3636959d4c176797814937c497b986)

Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>

Add more tests.  Fix code excerpt. (GH-25549) (GH-25550)

bpo-43917: Fix pure python equivalent for classmethod (GH-25544) (GH-25546)

Reported by Yahor Harunovich.
(cherry picked from commit 14092b5a4ae4caf1c77f685450016a0d1ad0bd6c)

bpo-39572: Address typo in CHANGELOG. (GH-24999)

(cherry picked from commit 6afb0a8078ff3fc93adc4177565c56f820ca2880)

Co-authored-by: Simon Charette <charette.s@gmail.com>

bpo-38822: Check specifically for a drive, not just a colon (GH-25540)

(cherry picked from commit e07d8098892e85ecc56969d2c9a5afb3ea33ce8f)

Co-authored-by: Steve Dower <steve.dower@python.org>

bpo-35306: Avoid raising OSError from pathlib.Path.exists when passed an invalid filename (GH-25529)

(cherry picked from commit 4696f1285d83dd7b69f459c63e14080b1f87f797)

Co-authored-by: Steve Dower <steve.dower@python.org>

bpo-38822: Fixed os.stat failing on inaccessible directories. (GH-25527)

It would just fail if the path was inaccessible and had a trailing slash. It should fall back to the parent directory's metadata.
(cherry picked from commit fe63a401a9b3ca1751b81b5d6ddb2beb7f3675c1)

Co-authored-by: Steve Dower <steve.dower@python.org>

bpo-28724: Doc: Move socket.send_fds and socket.recv_fds docs to right section (GH-22608)

(cherry picked from commit 660592f67c0d825b06eb4a38ccc04b34a1f01f00)

Co-authored-by: Saiyang Gou <gousaiyang@163.com>

bpo-26227: Fixes decoding of host names on Windows from ANSI instead of UTF-8 (GH-25510)

(cherry picked from commit dc516ef8395d15da0ab225eb0dceb2e0581f51ca)

Co-authored-by: Steve Dower <steve.dower@python.org>

Improve the error message for choices(population, 10) (GH-25267) (GH-25477)

bpo-43837: Reverse order of precedence table to show tightly binding operators first (GH-25469) (GH-25472)

Fix typo in a dataclasses comment. (GH-25454)

(cherry picked from commit 76beadb8ff86eb2bb248bf918bfb20c4069932f4)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>

[3.9] bpo-43522: Fix SSLContext.hostname_checks_common_name (GH-24899) (GH-25451)

Fix problem with ssl.SSLContext.hostname_checks_common_name. OpenSSL does not
copy hostflags from *struct SSL_CTX* to *struct SSL*.

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

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

bpo-43842: Fix race condition in test_logging SMTP test (GH-25436) (GH-25437)

Fix a race condition in the SMTP test of test_logging. Don't close a
file descriptor (socket) from a different thread while
asyncore.loop() is polling the file descriptor.

(cherry picked from commit 75ec103b3adbb7c619a0e22fa60f3d34c5a9e603)

[3.9] bpo-43723: Revert IDLE doc change (GH-25174)

Change threading.activeCount to synonym threading.active_count.

bpo-20364: Improve sqlite3 placeholder docs (GH-25003)

(cherry picked from commit 3386ca0b36327afeef8d7eff277b2aed1030c08d)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

bpo-43777: Drop description of "pip search" command from tutorial (GH-25287)

(cherry picked from commit 133705b85cc25d1e6684d32f8943ca288fadfda0)

Co-authored-by: Bob Kline <bkline@users.noreply.github.com>

Revert "Add ignore file for the abidump check (GH-25323)" (GH-25394)

This reverts commit b3fec753bb14e10066be908b93d3448c6b433ea6.

[3.9] bpo-43811: Test multiple OpenSSL versions on GHA (GH-25360) (GH-25391)

The new checks are only executed when one or more OpenSSL-related files are modified. The checks run a handful of networking and hashing test suites. All SSL checks are optional. This PR also introduces ccache to speed up compilation. In common cases it speeds up configure and compile time from about 90 seconds to less than 30 seconds.

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

Co-authored-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: GH:tiran

bpo-43816: Add extern "C" to Include/cpython/pyctype.h (GH-25365) (GH-25387)

Signed-off-by: Andrew V. Jones <andrew.jones@vector.com>
(cherry picked from commit 54db51c9114ac49030832f5134979ca866ffd21c)

Co-authored-by: Andrew V. Jones <andrewvaughanj@gmail.com>
Co-authored-by: Andrew V. Jones <andrewvaughanj@gmail.com>

[3.9] bpo-43799: OpenSSL 3.0.0: declare OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25382)

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

Co-authored-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: GH:tiran

[3.9] bpo-42248: [Enum] ensure exceptions raised in ``_missing_`` are released (GH-25350). (GH-25370)

(cherry picked from commit 8c14f5a787b21d5a1eae5d5ee981431d1c0e055f)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>

bpo-41661: Document os.path.relpath() exception on Windows with different drives (GH-25346)

(cherry picked from commit 67c0b3d89c4da9750fdb43fc66d3924681b22d2e)

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

bpo-41561: Fix testing with OpenSSL 1.0.2 (GH-25355)

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

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

bpo-42967: coerce bytes separator to string in urllib.parse_qs(l) (GH-24818)

* coerce bytes separator to string

* Add news

* Update Misc/NEWS.d/next/Library/2021-03-11-00-31-41.bpo-42967.2PeQRw.rst
(cherry picked from commit b38601d49675d90e1ee6faa47f7adaeca992d02d)

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

Fix description of behaviour of an exception class in 'from' clause (GH-24303) (GH-25341)

(cherry picked from commit 79650d0118b0a8861428b9dd063089de405cf137)

Co-authored-by: Mark Dickinson <mdickinson@enthought.com>
Co-authored-by: Mark Dickinson <mdickinson@enthought.com>

bpo-43739: Add type declaration Doc/extending/extending.rst example (GH-25333)

Add ignore file for the abidump check (GH-25323)

bpo-38820: OpenSSL 3.0.0: Use supported hashing algos in doc test (GH-25319)

ripemd160 is not available in OpenSSL 3.0.0's default crypto provider.
It's only present in legacy provider.

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

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

[3.9] bpo-43779: Fix possible refleak involving _PyArena_AddPyObject (GH-25289). (GH-25294)

* [3.9] Fix possible refleak involving _PyArena_AddPyObject (GH-25289).
(cherry picked from commit c0e11a3ceb9427e09db4224f394c7789bf6deec5)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
* Update Parser/pegen/pegen.c

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

[3.9] bpo-43788: Generate version specific _ssl_data.h (GH-25300) (GH-25310)

(cherry picked from commit 150af7543214e1541fa582374502ac1cd70e8eb4)

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

bpo-43794: OpenSSL 3.0.0: set OP_IGNORE_UNEXPECTED_EOF by default (GH-25309)

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

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

bpo-4379: Skip TLS 1.0/1.1 tests under OpenSSL 3.0.0 (GH-25304)

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

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

bpo-43789: OpenSSL 3.0.0 Don't call passwd callback again in error case (GH-25303)

(cherry picked from commit d3b73f32ef7c693a6ae8c54eb0e62df3b5315caf)

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

Add CI step to check changes in the exported ABI (GH-25230)

[3.9] bpo-39702: Remove dotted_name from decorator documentation (GH-25234) (GH-25290)

(cherry picked from commit 1e051a21b7106a93c30b74aad7e1f40d6c0c477b)

Co-authored-by: Saiyang Gou <gousaiyang@163.com>
Automerge-Triggered-By: GH:brandtbucher

[3.9] bpo-43087: Fix error in ctypes "Incomplete Types" doc (GH-24404)

The previous "Fundamental data types" section says a c_char_p must be bytes (or None).
(cherry picked from commit 14829b09eb652f457cf837836909169746a810f0)

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

Fix broken test for MutableSet.pop() (GH-25209) (GH-25269)

[3.9] bpo-36540: Improve doc of function definition regarding positional-only arguments (GH-25235) (GH-25259)

(cherry picked from commit 58d72cab89cf9652acc0bf0007aa20b2bcc98499)

Co-authored-by: Saiyang Gou <gousaiyang@163.com>

bpo-43755: Update docs to reflect that lambda is not allowed in `comp_if` since 3.9 (GH-25231) (GH-25233)

bpo-42999: Expand and clarify pathlib.Path.link_to() documentation. (GH-24294)

Co-authored-by: Barney Gale <barney.gale@gmail.com>

bpo-43075: Fix ReDoS in urllib AbstractBasicAuthHandler (GH-24391) (GH-25247)

Fix Regular Expression Denial of Service (ReDoS) vulnerability in
urllib.request.AbstractBasicAuthHandler. The ReDoS-vulnerable regex
has quadratic worst-case complexity and it allows cause a denial of
service when identifying crafted invalid RFCs. This ReDoS issue is on
the client side and needs remote attackers to control the HTTP server.
(cherry picked from commit 7215d1ae25525c92b026166f9d5cac85fb1defe1)

Co-authored-by: Yeting Li <liyt@ios.ac.cn>
Co-authored-by: Yeting Li <liyt@ios.ac.cn>

bpo-43105: Importlib now resolves relative paths when creating module spec objects from file locations (GH-25121)

Fix blurb for bpo-43176. (GH-25215) (GH-25217)

(cherry picked from commit 1744c96ebc98b240f2564f75191097704b37244f)

Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>

bpo-43745: Actually updates Windows release to OpenSSL 1.1.1k. (GH-25213)

Earlier releases were mislabelled and included 1.1.1i again.
The tag/directory name is updated to ensure that builds get the fresh bits. However, the openssl-bin-1.1.1k tag in the repository has been forcibly updated, so fresh builds will be fine even without this change.

bpo-43176: Fix processing of empty dataclasses (GH-24484) (GH-25205)

When a dataclass inherits from an empty base, all immutability checks are omitted. This PR fixes this and adds tests for it.

Automerge-Triggered-By: GH:ericvsmith
(cherry picked from commit 376ffc6ac491da74920aed1b8e35bc371cb766ac)

Co-authored-by: Iurii Kemaev <6885137+hbq1@users.noreply.github.com>
Co-authored-by: Iurii Kemaev <6885137+hbq1@users.noreply.github.com>

bpo-17305: Link to the third-party idna package. (GH-25208)

So long as we don't have idna2008 in the standard library, we should at least point people to the third-party solution.
(cherry picked from commit 1d023e374cf96d143b065242131ddc9b889f9a1e)

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

bpo-20503: Show how isinstance() works with ABC registered classes. (GH-25175) (GH-25202)

bpo-36470: Allow dataclasses.replace() to handle InitVars with default values (GH-20867) (GH-25200)

Co-Authored-By: Claudiu Popa <pcmanticore@gmail.com>
Automerge-Triggered-By: GH:ericvsmith
(cherry picked from commit 75220674c07abfc90c2cd7862d04cfa2e2354450)

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

[3.9] Fix typo in turtledemo.two_canvases. (GH-25194)

(cherry picked from commit 4e2ef7084185d2220003b4b5538e3d8190b2dcd6)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

Post 3.9.4

Merge tag 'v3.9.4' into 3.9

Python 3.9.4

[3.9] bpo-41370: Add note about ForwardRefs and PEP585 generic types in docs (GH-25183) (GH-25184)

(cherry picked from commit 2b5913b4ee5852a28ca1509478f5582beb3aff7b)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Automerge-Triggered-By: GH:gvanrossum

Python 3.9.4

[3.9] bpo-43710: Rollback the 3.9 bpo-42500 fix, it broke the ABI in 3.9.3 (#25179)

This reverts commit 8b795ab5541d8a4e69be4137dfdc207714270b77.

It changed the PyThreadState structure size, breaking the ABI in 3.9.3.

bpo-43325: Add FAQ entry for identity tests (GH-25168) (GH-25178)

Replace broken example code with correct simpler code. (GH-25162) (GH-25166)

Add more tests for the descriptor tutorial (GH-25164) (#25165)

(cherry picked from commit e4c8895ee5457b11f52841b79b51f3c3d6373fef)

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

bpo-43705: Document that SyntaxError's offsets are 1-indexed (GH-25153)

Changed the inline mentions of the attributes into a proper attribute list like `SystemExit` has.

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

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

Post 3.9.3

Merge tag 'v3.9.3' into 3.9

Python 3.9.3

[3.9] bpo-26053: Fix args echoed by pdb run command  (GH-25149)

* bpo-26053: Fix args echoed by pdb run command (GH-22033)

(cherry picked from commit 652bfdee9495dca241d48278742fe035b7a82bdb)

* bpo-26053: Fix test_pdb.test_issue26053() (GH-25139)

(cherry picked from commit bd4ab8e73906a4f12d5353f567228b7c7497baf7)

Python 3.9.3

bpo-43700: Replace Zulip badge with Discourse badge (GH-25141)

Automerge-Triggered-By: GH:zware
(cherry picked from commit bef7b26f7229f8b7cde843118a7bc7e2b00f0372)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

bpo-43677: Fix a minor error in Doc/howto/descriptor.rst (GH-25123) (#25140)

Doc: io: Remove "In-memory streams" section (GH-24927)

(cherry picked from commit b045cdaf341f80b7d1e4804b932b6e415600c2e1)

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

bpo-42840: Document providing kwargs to type. (GH-24173)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
(cherry picked from commit 72fcd14a82369ed32a5846d76f50e3026cf4eec2)

Co-authored-by: Erik Soma <stillusingirc@gmail.com>

bpo-37945: Fix test_locale.test_getsetlocale_issue1813() (GH-25110) (GH-25112)

Skip the test if setlocale() fails.
(cherry picked from commit f3ab670fea75ebe177e3412a5ebe39263cd428e3)

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

bpo-42225: IDLE - document two unix-related problems. (GH-25078)

1. Bad IP masquerade rules can prevent startup.
2. X cannot handle some complex colored chars.
(cherry picked from commit 1b4a9c7956d5dc64f8002f62bf0faae2d1892f90)

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

bpo-43399: Fix ElementTree.extend not working on iterators (GH-24751)

(cherry picked from commit 51a85ddce8b336addcb61b96f04c9c5edef07296)

Co-authored-by: Alex Prengère <2138730+alexprengere@users.noreply.github.com>

[3.9] bpo-43631: Update to OpenSSL 1.1.1k (GH-25024) (GH-25088)

Signed-off-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc683f237d8f0b6e999a63aa9b8c0a45b7fef)

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

bpo-43637: Fix a possible memory leak in winreg.SetValueEx() (GH-25038)

(cherry picked from commit dfeec347f21b86879ba8f27f567bb275b243f1bc)

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

bpo-33164: blake2: Fix Coverity scan (GH-25060)

(cherry picked from commit 068ebf9729d440cef03e4c57e3db83c851146172)

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

bpo-43660: Fix crash when displaying exceptions with custom values for sys.stderr (GH-25075) (GH-25083)

(cherry picked from commit 09b90a037d18f5d4acdf1b14082e57bda78e85d3)

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

bpo-43562: fix test_ssl to skip on unreachable network (GH-24937) (GH-25046)

This test checks result code of the connection directly, so it never raises an exception that can be suppressed by `support.transient_internet`. Directly support skipping the test in case of unreachable network.
(cherry picked from commit 29c451c6989c3c94fa0a9facf187c24f3cbf2420)

Co-authored-by: Carl Meyer <carl@oddbird.net>
Co-authored-by: Carl Meyer <carl@oddbird.net>

bpo-43659:  Fix test_curses on AIX (GH-25074)

curses.update_lines_cols() is only defined when the curses library
provides either resizeterm() or resize_term() functions which are optional
and are not provided on AIX.
(cherry picked from commit c8b5738810516df5722caf049003e9b319427bec)

Co-authored-by: Michael Felt <aixtools@users.noreply.github.com>

bpo-35930: Raising an exception raised in a "future" instance will create reference cycles (GH-24995) (#25070)

Before: https://lists.es.python.org/pipermail/general/attachments/20201229/0c14bc58/attachment-0002.png

After: https://lists.es.python.org/pipermail/general/attachments/20201229/0c14bc58/attachment-0003.png
(cherry picked from commit 32430aadadf6e012e39167d3c18a24e49fb84874)

Co-authored-by: Jesús Cea <jcea@jcea.es>
Co-authored-by: Jesús Cea <jcea@jcea.es>

bpo-43433: Preserve query and fragment in the URL of the server in ServerProxy. (GH-25057)

(cherry picked from commit c1b073a630bb731de18bb17afb2b8b1388b92a72)

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

bpo-42988: Remove the pydoc getfile feature (GH-25015)

CVE-2021-3426: Remove the "getfile" feature of the pydoc module which
could be abused to read arbitrary files on the disk (directory
traversal vulnerability). Moreover, even source code of Python
modules can contain sensitive data like passwords. Vulnerability
reported by David Schwörer.
(cherry picked from commit 9b999479c0022edfc9835a8a1f06e046f3881048)

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

bpo-31907: [doc] clarify that str.format() does not support arbitrary expressions (GH-25053) (GH-25055)

(cherry picked from commit fb1d01b9630b5069fe975f16e07a027d90b89434)

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

bpo-43644: Add docs for importlib.resources.as_file. (GH-25048)

(cherry picked from commit af50c84643ce21cfbdfdabbdfae6bd5e1368c542)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

[3.9] bpo-43617: Check autoconf-archive package in configure.ac (GH-25016) (GH-25034)

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

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

bpo-39231: correct tutorial annotations section (GH-25029)

(cherry picked from commit a53e9a7cf5912a44c5143e353912e44cfcfca7dc)

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

bpo-39616: clarify SSLContext.check_hostname effect (GH-18484)

It doesn't actually affect whether match_hostname() is called (it
never is in this context any longer), but whether hostname
verification occurs in the first place.
(cherry picked from commit 9798cef92b882cd82a338d3368eaf3c4a32f5c2d)

Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>

bpo-43620: Remove reference to os.sep from os.path.join() doc (GH-25025) (#25027)

- removed ambiguous reference to os.sep from os.path.join() doc
(cherry picked from commit 21a2cabb3795f5170c746ab8f29e9d25c7442550)

Co-authored-by: Jared Sutton <jpsutton@gmail.com>

[3.9] Clarify attribute docs on types.ModuleType (GH-24974) (#24994)

(cherry picked from commit 76b5d714e4e2b9f3b63847325cba51d4c4dc36bc)

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

Clarify attribute docs on types.ModuleType (GH-24974)

(cherry picked from commit 76b5d714e4e2b9f3b63847325cba51d4c4dc36bc)

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

bpo-43555: Report the column offset for invalid line continuation character (GH-24939) (#24975)

(cherry picked from commit 96eeff516204b7cc751103fa33dcc665e387846e)

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

bpo-43577: Fix deadlock with SSLContext._msg_callback and sni_callback (GH-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 77cde5042a2f1eae489c11a67540afaf43cd5cdf)

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

[3.9] bpo-43517 (followup): Install additional test directory (GH-24950) (GH-24951)

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

(cherry picked from commit 66c8adfa27aeea004657ef29b6db4e4c360ad611)

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

[3.9] bpo-43517: Fix false positive in detection of circular imports (GH-24895) (GH-24948)

(cherry picked from commit 2fd16ef406bba239b1334057fb499496a84b3aa2)

Co-authored-by: Antoine Pitrou <antoine@python.org>
Automerge-Triggered-By: GH:pitrou

bpo-43521: Allow ast.unparse with empty sets and NaN (GH-24897)

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

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

bpo-41561: Add workaround for Ubuntu's custom security level (GH-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 f6c6b5821bff815bdc810de53992fd1fbdb2edd4)

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

Add a warning block around the get_referrers() documentation (GH-24511)

(cherry picked from commit 813db24f7c2c536d587d1832c3c52b44fa9e242e)

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