…H-16108) (GH-16114)

https://bugs.python.org/issue34706

Specifically in the case of a class that does not override its
constructor signature inherited from object.

These are Buck Evan @bukzor's changes cherrypicked from GH-9344.
(cherry picked from commit 5b9ff7a)

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

(cherry picked from commit 0bc17ea)

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

(cherry picked from commit a26ace1)

Co-authored-by: Anthony Sottile <asottile@umich.edu>

Typically, the second positional argument for ``seek()`` is *whence*. That is the POSIX standard name (http://man7.org/linux/man-pages/man3/lseek.3p.html) and the name listed in the documentation for ``io`` module (https://docs.python.org/3/library/io.htmlGH-io.IOBase.seek).

The tutorial for IO is the only location where the second positional argument for ``seek()`` is referred to as *from_what*. I suspect this was created at an early point in Python's history, and was never updated (as this section predates the GitHub repository):

```
$ git grep "from_what"
Doc/tutorial/inputoutput.rst:To change the file object's position, use ``f.seek(offset, from_what)``.  The position is computed
Doc/tutorial/inputoutput.rst:the *from_what* argument.  A *from_what* value of 0 measures from the beginning
Doc/tutorial/inputoutput.rst:the reference point.  *from_what* can be omitted and defaults to 0, using the
```

For consistency, I am suggesting that the tutorial be updated to use the same argument name as the IO documentation and POSIX standard for ``seek()``, particularly since this is the only location where *from_what* is being used.

Note: In the POSIX standard, *whence* is technically the third positional argument, but the first argument *fildes* (file descriptor) is implicit in Python.

https://bugs.python.org/issue37635
(cherry picked from commit ff603f6)

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

)

https://bugs.python.org/issue38178
(cherry picked from commit c717c73)

Co-authored-by: Hrvoje Nikšić <hniksic@gmail.com>

(cherry picked from commit 24d1597)

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

…H-16136) (GH-16175)

(cherry picked from commit 56a4514)


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

Automerge-Triggered-By: @zhangyangyu

…on (GH-7764) (GH-16181)

Attempt to make isolated mode easier to discover via additional inline documentation.

Co-Authored-By: Julien Palard <julien@palard.fr>.
(cherry picked from commit bdd6945)

Co-authored-by: Xtreak <tir.karthi@gmail.com>

…) (GH-16188)

(cherry picked from commit f18242b)

Co-authored-by: Adorilson Bezerra <adorilson@gmail.com>

https://bugs.python.org/issue38100



Automerge-Triggered-By: @matrixise

(cherry picked from commit 336b306)

Co-authored-by: amist <amistern0@gmail.com>

…GH-16140) (GH-16200)

``OPENSSL_VERSION_1_1`` was never defined in ``_hashopenssl.c``. 


https://bugs.python.org/issue33936
(cherry picked from commit 724f1a5)


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


https://bugs.python.org/issue33936



Automerge-Triggered-By: @tiran

This PR replaces the old note mentioning that `typing` is a provisional module with a new one mentioning types are not enforced at runtime. I am not sure if there was any official announcement about making `typing` non-provisional, but _de-facto_ no new features were added during Python 3.7, and no backwards incompatible changes were made except for few small things that were considered bugs.
(cherry picked from commit 81528ba)

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

It no longer tries to create or access .idlerc or any files within.
Users must run IDLE to discover problems with saving settings.
(cherry picked from commit 0048afc)

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

(cherry picked from commit 63dedef)

Co-authored-by: Adorilson Bezerra <adorilson@gmail.com>

…H-16155)

(cherry picked from commit 8debfa5)

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

One happens when EditorWindow.close is called twice.
Printing a traceback, when IDLE is run from a terminal,
is useless and annoying.
(cherry picked from commit dfd34a9)

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

…dexing. (GH-16190)

(cherry picked from commit f669581)

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

…H-16202)

See https://bugs.python.org/issue38192 .

https://bugs.python.org/issue38192
(cherry picked from commit 5d359cc)

Co-authored-by: Hrvoje Nikšić <hniksic@gmail.com>

(cherry picked from commit 219fb9d)

Co-authored-by: Jörn Heissler <joernheissler@users.noreply.github.com>

…16223)

When using multiprocesss (-jN), the main process now uses a timeout
of 60 seconds instead of the double of the --timeout value. The
buildbot server stops a job which does not produce any output in 1200
seconds.
(cherry picked from commit 46b0b81)

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

…ceptions (GH-16070)

Even when the helper is not started yet.

This behavior follows conventional generator one.
There is no reason for `async_generator_athrow` to handle `gen.throw()` differently.

https://bugs.python.org/issue38013
(cherry picked from commit c275312)

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

…16222) (GH-16239)

This includes such names as "cls", "self", "typename" and "fields".
(cherry picked from commit 2bf31cc)

A little change on first paragraph of python tutorial to be more clearly

https://bugs.python.org/issue37904

Automerge-Triggered-By: @ericvsmith
(cherry picked from commit b574813)

Co-authored-by: Diego Alberto Barriga Martínez <diegobarriga@protonmail.com>

…H-16260)

dump_traceback_later() and cancel_dump_traceback_later() functions of
the faulthandler module are always available since Python 3.7.
(cherry picked from commit 064e1e3)

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

… (GH-16275)

Signed-off-by: Jason Plurad <pluradj@us.ibm.com>
(cherry picked from commit 9ab6038)

Co-authored-by: Jason Plurad <pluradj@us.ibm.com>

(cherry picked from commit 3171d67)

Co-authored-by: toonarmycaptain <toonarmycaptain@hotmail.com>

(cherry picked from commit fb7746d)

(cherry picked from commit 062cfe3)

Co-authored-by: Prateek Nayak <45075669+Kriyszig@users.noreply.github.com>

Mention frame.f_trace in sys.settrace docs, as well as the fact you still
need to call `sys.settrace` to enable the tracing machinery before setting
`frame.f_trace` will have any effect.
(cherry picked from commit 9c2682e)

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

(cherry picked from commit bb16fb2)

Co-authored-by: HongWeipeng <hongweichen8888@sina.com>

…H-16326)

(cherry picked from commit 1d094af)

…H-16230)

(cherry picked from commit 4346bad)

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

…H-16348)

Multiprocessing tests: increase test_queue_feeder_donot_stop_onexc()
timeout from 1 to 60 seconds.
(cherry picked from commit 99799c7)

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

Multiprocessing test test_mymanager() now also expects -SIGTERM, not
only exitcode 0.

bpo-30356: BaseManager._finalize_manager() sends SIGTERM to the
manager process if it takes longer than 1 second to stop, which
happens on slow buildbots.
(cherry picked from commit b0e1ae5)

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

GH-15839) (GH-16369)

(cherry picked from commit 12f209e)

…H-16374)

Handle spec errors in assert_has_calls (GH-16005) (GH-16364)

The fix in PR 13261 handled the underlying issue about the spec for specific methods not being applied correctly, but it didn't fix the issue that was causing the misleading error message.

The code currently grabs a list of responses from _call_matcher (which may include exceptions). But it doesn't reach inside the list when checking if the result is an exception. This results in a misleading error message when one of the provided calls does not match the spec.

https://bugs.python.org/issue36871

Co-authored-by: Samuel Freilich <sfreilich@google.com>

(cherry picked from commit 1a17a05)

Add docs about return and raise exception on asyncio.run

https://bugs.python.org/issue38260

Automerge-Triggered-By: @asvetlov
(cherry picked from commit 17deb16)

Co-authored-by: Emmanuel Arias <emmanuelarias30@gmail.com>

GH-16392)

Improvement suggested by Géry Ogam.
(cherry picked from commit 15ccc4f)

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

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>