(cherry picked from commit 268cc7c3)

Co-authored-by: Andrés Delfino adelfino@gmail.com

Skip test_load_dh_params() of test_ssl when Python filesystem encoding
cannot encode the provided path.

* Fixed a leak when the GC fails to add an object with __del__ into
  the gc.garbage list.
* PyGC_Collect() can now be called when an exception is set and
  preserves it.
(cherry picked from commit 301e3cc8)

(cherry picked from commit d5f14426)
Co-authored-by: Andrés Delfino <adelfino@gmail.com>

(cherry picked from commit 1179f4b4)
Co-authored-by: INADA Naoki <methane@users.noreply.github.com>

uuid._ipconfig_getnode did not validate the maximum length of the value,
so long as the value had the same type of formatting as a MAC address.
This let it select DUIDs as MAC addresses. It now requires an exact
length match..
(cherry picked from commit c66c342c)
Co-authored-by: CtrlZvi <viz+github@flippedperspective.com>

Fixes incorrect error text for int('1', base=1000)
and long('1', base=1000).

(cherry picked from commit bde3e0bf)

(cherry picked from commit 19177fbd)
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>

The robotparser's __str__ representation now includes wildcard
entries.
(cherry picked from commit c3fa1f2b93fa4bf96a8aadc74ee196384cefa31e)

Co-authored-by: Michael Lazar <lazar.michael22@gmail.com>.

Clarify that flush is implied when the call to write contains a newline character.
(cherry picked from commit 7ffd4c58)
Co-authored-by: Elena Oat <oat.elena@gmail.com>

(cherry picked from commit ddb6215a)

This partially reverts commit e80a232f.

[2.7] bpo-33422: Fix quotation marks getting deleted when looking up byte/string literals on pydoc. (GH-6701) (GH-6712)

Also update the list of string prefixes.
(cherry picked from commit b2043bbe)

[2.7] bpo-20087: Update locale alias mapping with glibc 2.27 supported locales. (GH-6708). (GH-6717)

(cherry picked from commit cedc9b74)

(cherry picked from commit 74382a3f)

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

(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>

[2.7] bpo-33256: Replace angle brackets around python object repr to display it in html (GH-6442). (GH-6650)

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

By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
8 are starting to use alignment information to do store-merging. So, the "long
double" needs to be changed to a simple "double" as was long ago done in Python
3 by e348c8d1. For 2.7, we need to add some
dummy padding to make sure _PyGC_Head stays the same size.

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

This was broken by poor automated translation back in 6e3dbbdf.

(cherry picked from commit e9d9494d)

We don't use debugger on Travis.
(cherry picked from commit 8ff53564)

(cherry picked from commit 1ba9469e)

Also update PIL doc references to Pillow.
(cherry picked from commit 'b81ca28b')

Co-authored-by: 'Andrés Delfino.34587441+andresdelfino@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 4b685bf7)

Update only the documentation about image formats.

Converting with line_info=False and col_info=True crashed before.
(cherry picked from commit e5362eaa)

`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>

In fact, we now require a newer Sphinx version because APIs have moved around..
(cherry picked from commit acfb087f)