The private keys for test_ssl were encrypted with 3DES in traditional
PKCSGH-5 format. 3DES and the digest algorithm of PKCSGH-5 are blocked by
some strict crypto policies. Use PKCSGH-8 format with AES256 encryption
instead.

Signed-off-by: Christian Heimes <christian@python.org>

https://bugs.python.org/issue38271

Automerge-Triggered-By: @tiran
(cherry picked from commit bfd0c96)

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

…ng. (GH-16381) (GH-16400)

(cherry picked from commit c64af8f)

…6407)

Fixes CVE-2019-15903. See full changelog at https://github.com/libexpat/libexpat/blob/R_2_2_8/expat/Changes..
(cherry picked from commit 52b9408)

Co-authored-by: Benjamin Peterson <benjamin@python.org>

…GH-16271) (GH-16413)

(cherry picked from commit 5d326ab)

Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>

…-16016) (GH-16416)

Co-Authored-By: Ashwin Ramaswami <aramaswamis@gmail.com>
(cherry picked from commit 1ad7be2)

Co-authored-by: Mohammad Dehghan <md.unicorn@gmail.com>

…H-16426)

(cherry picked from commit 64b4a3a)

test_ssl now handles disabled TLS/SSL versions better. OpenSSL's crypto
policy and run-time settings are recognized and tests for disabled versions
are skipped.

Signed-off-by: Christian Heimes <christian@python.org>

https://bugs.python.org/issue38275
(cherry picked from commit df6ac7e)

Escape the server title of xmlrpc.server.DocXMLRPCServer
when rendering the document page as HTML.
(cherry picked from commit e8650a4)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

…H-16446) (#16450)

(cherry picked from commit 52d1b86)

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

…alidation and encoding behavior (GH-16448) (GH-16461)

* bpo-38216: Allow bypassing input validation

* bpo-36274: Also allow the URL encoding to be overridden.

* bpo-38216, bpo-36274: Add tests demonstrating a hook for overriding validation, test demonstrating override encoding, and a test to capture expectation of the interface for the URL.

* Call with skip_host to avoid tripping on the host checking in the URL.

* Remove obsolete comment.

* Make _prepare_path_encoding its own attr.

This makes overriding just that simpler.

Also, don't use the := operator to make backporting easier.

* Add a news entry.

* _prepare_path_encoding -> _encode_prepared_path()

* Once again separate the path validation and request encoding, drastically simplifying the behavior. Drop the guarantee that all processing happens in _prepare_path..
(cherry picked from commit 7774d78)

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

…ix pipe (GH-16472)

(cherry picked from commit 58498bc)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>

(cherry picked from commit e407013)

Co-authored-by: Kyle Stanley <aeros167@gmail.com>

* Windows: Fix counter name in WindowsLoadTracker. Counter names are
  localized: use the registry to get the counter name. Original
  change written by Lorenz Mende.
* Regrtest.main() now ensures that the Windows load tracker is also
  killed if an exception is raised
* TestWorkerProcess now ensures that worker processes are no longer
  running before exiting: kill also worker processes when an
  exception is raised.
* Enhance regrtest messages and warnings: include test name,
  duration, add a worker identifier, etc.
* Rename MultiprocessRunner to TestWorkerProcess
* Use print_warning() to display warnings.

Co-Authored-By: Lorenz Mende <Lorenz.mende@gmail.com>
(cherry picked from commit 982bfa4)

Co-authored-by: Victor Stinner <vstinner@redhat.com>

(cherry picked from commit 891e9e3)

Co-authored-by: Géry Ogam <gery.ogam@gmail.com>

test.pythoninfo now logs environment variables used by OpenSSL and
Python ssl modules, and logs attributes of 3 SSL contexts
(SSLContext, default HTTPS context, stdlib context).
(cherry picked from commit b3e7045)

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

…H-16550) (GH-16560)

* bpo-36670, regrtest: Fix WindowsLoadTracker() for partial line (GH-16550)

WindowsLoadTracker.read_output() now uses a short buffer for
incomplete line.

(cherry picked from commit 3e04cd2)

* bpo-36670: Enhance regrtest WindowsLoadTracker (GH-16553)

The last line is now passed to the parser even if it does not end
with a newline, but only if it's a valid value.

(cherry picked from commit c65119d)

* bpo-36670: Enhance regrtest (GH-16556)

* Add log() method: add timestamp and load average prefixes
  to main messages.
* WindowsLoadTracker:

  * LOAD_FACTOR_1 is now computed using SAMPLING_INTERVAL
  * Initialize the load to the arithmetic mean of the first 5 values
    of the Processor Queue Length value (so over 5 seconds), rather
    than 0.0.
  * Handle BrokenPipeError and when typeperf exit.

* format_duration(1.5) now returns '1.5 sec', rather than
  '1 sec 500 ms'

(cherry picked from commit 098e256)
(cherry picked from commit de3195c)

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

)

(cherry picked from commit b23a842)

Co-authored-by: idomic <michael.ido@gmail.com>

…16571) (GH-16577)

(cherry picked from commit 3142c66)

Co-authored-by: Ashley Whetter <AWhetter@users.noreply.github.com>

…cl. (GH-16545)

On Windows use UTF-16 (or UTF-32 for 32-bit Tcl_UniChar) with the
"surrogatepass" error handler for converting to/from Tcl Unicode objects.

On Linux use UTF-8 with the "surrogateescape" error handler for converting
to/from Tcl String objects.

Converting strings from Tcl to Python and back now never fails
(except MemoryError).
(cherry picked from commit 06cb94b)

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

… bytearray. (GH-16603)

(cherry picked from commit 24ddd9c)

Co-authored-by: Hai Shi <shihai1992@gmail.com>

…16588)

The `required` argument to `argparse.add_subparsers` was added in GH-3027. This PR specifies the earliest version of Python where it is available.

https://bugs.python.org/issue26510

Automerge-Triggered-By: @merwok
(cherry picked from commit 9e71917)

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

(cherry picked from commit 038503e)

Co-authored-by: Krishna Oza <krishoza15sep@gmail.com>

(cherry picked from commit e310af9)

Co-authored-by: James Abel <j@abel.co>

(cherry picked from commit 5dfbb4d)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…o stderr. (GH-16583)

It now escapes them with a backslash, as the regular Python interpreter.
Added the "errors" field to the standard streams.
(cherry picked from commit b690a27)

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

Valgrind emits "Conditional jump or move depends on uninitialised
value(s)" false alarms on GCC builtin strcmp() function. The GCC code
is correct.

Valgrind bug: https://bugs.kde.org/show_bug.cgi?id=264936
(cherry picked from commit 03ab6b4)

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

…umentation. (GH-16442) (GH-16647)

Prior to 3.7, re.escape escaped many characters that don't have
special meaning in Python, but that use to require escaping in other
tools and languages. This commit aims to make it clear which characters
were, but are no longer escaped.
(cherry picked from commit 15ae75d)

(cherry picked from commit 01171eb)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…/unions. (GH-16589) (GH-16672)

(cherry picked from commit e8bedbd)

Bump the removal to 3.9, indicate collections.abc available since 3.3,
replace version-changed directive to deprecated-removed.

https://bugs.python.org/issue36953
(cherry picked from commit eea47e0)

Co-authored-by: Matthias Bussonnier <mbussonnier@ucmerced.edu>

…le. (GH-16641). (GH-16674)

(cherry picked from commit 13abda4)

…6644). (GH-16673)

(cherry picked from commit 8252c52)

bpo-37531, bpo-38207: On timeout, regrtest no longer attempts to call
`popen.communicate() again: it can hang until all child processes
using stdout and stderr pipes completes. Kill the worker process and
ignores its output.

Reenable test_regrtest.test_multiprocessing_timeout().

bpo-37531: Change also the faulthandler timeout of the main process
from 1 minute to 5 minutes, for Python slowest buildbots.
(cherry picked from commit 0ec618a)

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

…H-16658) (GH-16685)

* [bpo-38379](https://bugs.python.org/issue38379):  when a finalizer resurrects an object,
nothing is actually collected in this run of gc.
Change the stats to relect that truth..
(cherry picked from commit ecbf35f)

Co-authored-by: Tim Peters <tim.peters@gmail.com>





https://bugs.python.org/issue38379



Automerge-Triggered-By: @pablogsal

…16686)

(cherry picked from commit 09895c2)

(cherry picked from commit a05fcd3)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

PR GH-4906 changed the typing.Generic class hierarchy, leaving an
outdated comment in the library reference. User-defined Generic ABCs now
must get a abc.ABCMeta metaclass from something other than typing.Generic
inheritance.
(cherry picked from commit d47f0dd)

Co-authored-by: M. Eric Irrgang <mei2n@virginia.edu>

Add missing stat.S_IFDOOR, stat.S_IFPORT, stat.S_IFWHT,
stat.S_ISDOOR, stat.S_ISPORT, and stat.S_ISWHT values to
the Python implementation of the stat module.
(cherry picked from commit 7bb1431)

Co-authored-by: Ronan Lamy <ronan.lamy@gmail.com>

(cherry picked from commit a8e0d31)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…H-16536) (GH-16719)

pathfix.py: Assume all files that end on '.py' are Python scripts when working recursively.

(cherry picked from commit 2b7dc40)

We no longer use AppVeyor in 3.x, and others were still pointed at master.

…H-16663)

The implementation of weakref.proxy's methods call back into the Python
API using a borrowed references of the weakly referenced object
(acquired via PyWeakref_GET_OBJECT). This API call may delete the last
reference to the object (either directly or via GC), leaving a dangling
pointer, which can be subsequently dereferenced.

To fix this, claim a temporary ownership of the referenced object when
calling the appropriate method. Some functions because at the moment they
do not need to access the borrowed referent, but to protect against
future changes to these functions, ownership need to be fixed in
all potentially affected methods..
(cherry picked from commit 10cd00a)

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





https://bugs.python.org/issue38395

)

Add SMTPNotSupportedError in the exports of smtplib

Co-Authored-By: Brandt Bucher <brandtbucher@gmail.com>
(cherry picked from commit 3faf826)

Co-authored-by: nde <denayer.norman@gmail.com>

KeyError should cause a failure in parsing the encoded word and should be caught and raised as a _InvalidEWError instead.
(cherry picked from commit 65dcc8a)

Co-authored-by: Andrei Troie <andreitroie90@gmail.com>

…low oper parsing of URLs (GH-15685)" (GH-16724) (GH-16727)

Reverts GH-15687 which caused the issue.


https://bugs.python.org/issue22347

https://bugs.python.org/issue38449

…ocs (GH-16743)

Metaclass was removed in Python 3.7 (there is already a `versionchanged` item about this).

https://bugs.python.org/issue28556
(cherry picked from commit 8144095)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>

)

(cherry picked from commit b23a842)

Co-authored-by: idomic <michael.ido@gmail.com>

…16571) (GH-16577)

(cherry picked from commit 3142c66)

Co-authored-by: Ashley Whetter <AWhetter@users.noreply.github.com>

…16588)

The `required` argument to `argparse.add_subparsers` was added in GH-3027. This PR specifies the earliest version of Python where it is available.

https://bugs.python.org/issue26510

Automerge-Triggered-By: @merwok
(cherry picked from commit 9e71917)

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

(cherry picked from commit 038503e)

Co-authored-by: Krishna Oza <krishoza15sep@gmail.com>

(cherry picked from commit e310af9)

Co-authored-by: James Abel <j@abel.co>

(cherry picked from commit 5dfbb4d)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…umentation. (GH-16442) (GH-16647)

Prior to 3.7, re.escape escaped many characters that don't have
special meaning in Python, but that use to require escaping in other
tools and languages. This commit aims to make it clear which characters
were, but are no longer escaped.
(cherry picked from commit 15ae75d)

(cherry picked from commit 01171eb)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…/unions. (GH-16589) (GH-16672)

(cherry picked from commit e8bedbd)

Bump the removal to 3.9, indicate collections.abc available since 3.3,
replace version-changed directive to deprecated-removed.

https://bugs.python.org/issue36953
(cherry picked from commit eea47e0)

Co-authored-by: Matthias Bussonnier <mbussonnier@ucmerced.edu>

PR GH-4906 changed the typing.Generic class hierarchy, leaving an
outdated comment in the library reference. User-defined Generic ABCs now
must get a abc.ABCMeta metaclass from something other than typing.Generic
inheritance.
(cherry picked from commit d47f0dd)

Co-authored-by: M. Eric Irrgang <mei2n@virginia.edu>

(cherry picked from commit a8e0d31)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

We no longer use AppVeyor in 3.x, and others were still pointed at master.

…low oper parsing of URLs (GH-15685)" (GH-16724) (GH-16727)

Reverts GH-15687 which caused the issue.


https://bugs.python.org/issue22347

https://bugs.python.org/issue38449

…ocs (GH-16743)

Metaclass was removed in Python 3.7 (there is already a `versionchanged` item about this).

https://bugs.python.org/issue28556
(cherry picked from commit 8144095)

Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com>

(cherry picked from commit 4504b45)

Co-authored-by: Julien Palard <julien@palard.fr>

(cherry picked from commit 2798b60)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

(cherry picked from commit 3f36043)

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

…16818)

main() is now responsible to send the ANSWER, rather than
ServerProto. main() now waits until it got the HELLO before sending
the ANSWER over the new transport.

Previously, there was a race condition between main() replacing the
protocol and the protocol sending the ANSWER once it gets the HELLO.

TLSv1.3 was disabled for the test: reenable it.

(cherry picked from commit fab4ef2)

* bpo-27657: Fix urlparse() with numeric paths

Revert parsing decision from bpo-754016 in favor of the documented
consensus in bpo-16932 of how to treat strings without a // to
designate the netloc.

* bpo-22891: Remove urlsplit() optimization for 'http' prefixed inputs.
(cherry picked from commit 5a88d50)

Co-authored-by: Tim Graham <timograham@gmail.com>

The Nose package is no longer maintained.
(cherry picked from commit 88eeda6)

Co-authored-by: Jon Dufresne <jon.dufresne@gmail.com>

…H-16869)

(cherry picked from commit 5bc6a7c)

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

…H-16860)

(cherry picked from commit 10ecbad)

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

…6876)

(cherry picked from commit dfe726b)

Co-authored-by: Kyle Stanley <aeros167@gmail.com>

Fix stdatomic.h header check for ICC compiler: the ICC implementation
lacks atomic_uintptr_t type which is needed by Python.

Test:

* atomic_int and atomic_uintptr_t types
* atomic_load_explicit() and atomic_store_explicit()
* memory_order_relaxed and memory_order_seq_cst constants

But don't test ATOMIC_VAR_INIT(): it's not used in Python.
(cherry picked from commit 028f734)

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

(cherry picked from commit d34ac30)

Co-authored-by: Peter Bittner <django@bittner.it>

(cherry picked from commit 01659ca)

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

These are valid even in python 2.7

https://bugs.python.org/issue33348

Automerge-Triggered-By: @gpshead
(cherry picked from commit 96b06ae)

Co-authored-by: Zsolt Dollenstein <zsol.zsol@gmail.com>

numbers's -> number's
(cherry picked from commit 7320ec0)

Co-authored-by: Hansraj Das <raj.das.136@gmail.com>

…nts in decorators. (GH-16861). (GH-16930)

(cherry picked from commit 26ae9f6)

(cherry picked from commit d898d20)

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

(cherry picked from commit e3f90b2)

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

(cherry picked from commit e31a79a)

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

…H-16937)

Test by Daniel Hillier.
(cherry picked from commit 5c32af7)

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

)

(cherry picked from commit 85c6f8c)

Co-authored-by: Marco Rougeth <marco@rougeth.com>

…C drive (GH-16968)

(cherry picked from commit 0ac6137)

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

…data. (GH-14656)

(cherry picked from commit da6ce58)

Co-authored-by: Daniel Hillier <daniel.hillier@gmail.com>

Update open() documentation.
(cherry picked from commit 1d2862a)

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

…n. (GH-16950) (GH-17000)

Replace all *NULL* with ``NULL``.
(cherry picked from commit 25fc088)

Also fix some other formatting.
(cherry picked from commit e835b31)

Change the url from docs.python-requests.org to requests.readthedocs.io
(cherry picked from commit 112f2b8)

Co-authored-by: Simon Legner <Simon.Legner@gmail.com>

(cherry picked from commit 65c7382)

Co-authored-by: MaT1g3R <peijun.ma@protonmail.com>

…H-16799) (GH-17017)

(cherry picked from commit 79d4ed1)

Whenever I use `path.suffix` I have to check again whether it includes the dot or not. I decided to add it to the docstring so I won't have to keep checking.

https://bugs.python.org/issue38422

Automerge-Triggered-By: @pitrou
(cherry picked from commit 8d4fef4)

Co-authored-by: Ram Rachum <ram@rachum.com>

s/pathing/patching/
(cherry picked from commit 25fa3ec)

Co-authored-by: Michael Haas <micha2718l@gmail.com>

GH-17027)

This was never intented to be called manually from PyInit_*.

Also, clarify PyState_RemoveModule return value.
(cherry picked from commit 9bc94ec)


Co-authored-by: Petr Viktorin <encukou@gmail.com>


https://bugs.python.org/issue38159



Automerge-Triggered-By: @encukou

Fixed what seemed to be a weird phrasing.

(cherry picked from commit 5e01a65)

Co-authored-by: Jules Lasne (jlasne) <jules.lasne@gmail.com>.
(cherry picked from commit 1eac437)

Co-authored-by: Jules Lasne (jlasne) <jules.lasne@gmail.com>

(cherry picked from commit 56698d5)

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

The master and 3.8 versions of the previous change work as expected
because we perform the lookup for the `from_param` after the union
check. However, in 3.7, this lookup happens before the union
validation and so we must decrease the reference for `cnv` before
returning.

(cherry picked from commit befa032)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

(cherry picked from commit 98480ce)

Co-authored-by: Jonathan Scholbach <j.scholbach@posteo.de>

(cherry picked from commit 8341a4d)

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

…H-17103)

(cherry picked from commit c8b53dc)

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

Updates documentation around email.utils.parsedate_tz().

Currently, the documentation specifies that when a string without a is timezone passed to parsedate_tz(), the last tuple is returned as ```None```.

This is no longer true since Python 3.3


https://bugs.python.org/issue38421
(cherry picked from commit a12255d)


Co-authored-by: David K <dave@paddez.com>


https://bugs.python.org/issue38421



Automerge-Triggered-By: @encukou

* "Return true/false" is replaced with "Return ``True``/``False``"
  if the function actually returns a bool.
* Fixed formatting of some True and False literals (now in monospace).
* Replaced "True/False" with "true/false" if it can be not only bool.
* Replaced some 1/0 with True/False if it corresponds the code.
* "Returns <bool>" is replaced with "Return <bool>".
(cherry picked from commit 138ccbb)

…mode files. (GH-17137)

This change, which follows the behavior of C stdio's fdopen and Python 2's file object, allows pipes to be opened in append mode..
(cherry picked from commit 74fa9f7)

(cherry picked from commit 2d56af7)

Co-authored-by: Shu <23287722+susan-shu-c@users.noreply.github.com>

This immediately toggles shell, editor, and output windows, but does not affect other input widgets.
(cherry picked from commit 9c28449)

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