(cherry picked from commit c4994dc0)
Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>

(cherry picked from commit 491bbedc)
Co-authored-by: lekma <lekmalek@gmail.com>

(cherry picked from commit fc6aa28b)
Co-authored-by: Ned Deily <nad@python.org>

Currently, "pip3 install --upgrade pip" unconditionally installs a
"pip" alias even for Python 3.  If a user has an existing Python 3.x
installed from a python.org macOS installer and then subsequently
manually updates to a new version of pip, there may now be a stray
"pip" alias in the Python 3.x framework bin directory which can cause
confusion if the user has both a Python 2.7 and 3.x installed;
if the Python 3.x fw bin directory appears early on $PATH, "pip"
might invoke the pip3 for the Python 3.x rather than the pip for
Python 2.7.  To try to mitigate this, the macOS installer script
for the ensurepip option will unconditionally remove "pip" from
the 3.x framework bin directory being updated / installed.  (The
ambiguity can be avoided by using "pythonx.y -m pip".)
(cherry picked from commit 0dd80709)
Co-authored-by: Ned Deily <nad@python.org>

(cherry picked from commit 57794832)
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

Previously emitted cover files only when --missing option was used.
(cherry picked from commit 47ab1547)
Co-authored-by: Michael Selik <mike@selik.org>

In text and entry boxes, this affects selection by double-click,
movement left/right by control-left/right, and deletion left/right
by control-BACKSPACE/DEL.
(cherry picked from commit 5ff3a161)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>

(cherry picked from commit 9f3535c9)
Co-authored-by: Bo Bayles <bbayles@gmail.com>

(cherry picked from commit 7d68bfa8)
Co-authored-by: sblondon <sblondon@users.noreply.github.com>

(cherry picked from commit 70af06cd)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

(cherry picked from commit 2e38cc39)

(cherry picked from commit 67a8f4fe)
Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>

(cherry picked from commit e9d9494d)

Patch by Neeraj Badlani.
(cherry picked from commit 643ff711)
Co-authored-by: Neeraj Badlani <neerajbadlani@gmail.com>

We don't use debugger on Travis..
(cherry picked from commit 8ff53564)
Co-authored-by: INADA Naoki <methane@users.noreply.github.com>

Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some
reserved signal numbers between 1 and NSIG.  The `range(1, NSIG)` idiom
is commonly used to select all signals for blocking with `pthread_sigmask`.
So we ignore the sigaddset() return value until we expose sigfillset()
to provide a better idiom.
(cherry picked from commit 25038ecf)

(cherry picked from commit d5a2377c)
Co-authored-by: Berker Peksag <berker.peksag@gmail.com>

This used to be the case on Python 2.  Commit
212b590e changed the implementation for Python
3, making the `log()` method of LogAdapter call `logger._log()` directly.  This
makes nested log adapters not execute their ``process()`` method.  This patch
fixes the issue.

Also, now proxying `name`, too, to make `repr()` work with nested log adapters.

New tests added.
(cherry picked from commit ce9e6254)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>

Also update PIL doc references to Pillow.
(cherry picked from commit b81ca28b)
Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>

(cherry picked from commit 61f82e0e)

(cherry picked from commit 441d945e)
Co-authored-by: Brett Cannon <brettcannon@users.noreply.github.com>

Upgrade ensurepip to bundle pip 10.0.1
(cherry picked from commit 0399cf9b)
Co-authored-by: Paul Moore <p.f.moore@gmail.com>

(cherry picked from commit b87c1c92)
Co-authored-by: Gregory P. Smith <greg@krypto.org>

as docstrings and translatable strings, and rejects
bytes literals and f-string expressions.
(cherry picked from commit 69524821)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Converting with line_info=False and col_info=True crashed before.
(cherry picked from commit e5362eaa)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

(cherry picked from commit e3a523a0)
Co-authored-by: Denis Osipov <osipov_d@list.ru>

(cherry picked from commit 28e8b66d)
Co-authored-by: jdemeyer <jdemeyer@cage.ugent.be>

`test_urllib2net.OtherNetworkTests.test_sites_no_connection_close`
used `http://www.imdb.com/` but it is moved to https so the test is
not valid anymore.  Skip test for the moment to allow CI to proceed.
(cherry picked from commit 36d56ea8)
Co-authored-by: INADA Naoki <methane@users.noreply.github.com>

(cherry picked from commit 4b685bf7)
Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>

In fact, we now require a newer Sphinx version because APIs have moved around.
(cherry picked from commit acfb087f)
Co-authored-by: Benjamin Peterson <benjamin@python.org>

This note in documentation was never true.
(cherry picked from commit a00d440e)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>

(cherry picked from commit c89b2217)
Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>

The examples in argparse documentation use `error: too few arguments`
error message which was removed in this commit f97c59aa in 2011.
(cherry picked from commit 04e82934)
Co-authored-by: suic86 <marko.gabriel.cz@gmail.com>

(cherry picked from commit f178028f)
Co-authored-by: Devon R <Gorialis@users.noreply.github.com>

(cherry picked from commit 0f914b5b)
Co-authored-by: Aaron Ang <aaronang@users.noreply.github.com>

Based on patch by Oleg Krasnikov.
(cherry picked from commit c93938b5)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

The protocol parameter can be any protocol supported by the
pickle module.
(cherry picked from commit 2ef65f34)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

(cherry picked from commit 46936d5a)

When bpo-12015 got resolved by increasing the length of the
random string generated by _RandomNameSequence from six to eight
characters, the docstring of the class was not adjusted accordingly.
(cherry picked from commit 9c463ec8)
Co-authored-by: Wolfgang Maier <wolfgang.maier@biologie.uni-freiburg.de>