Based on patch by Oren Milman.

Patch by Eryk Sun.

Patch by SilentGhost.

implicit initialization of the type instead of a fail.

implicit initialization of the type instead of a fail.

argument.

Original patch by Niklas Koep.

Original patch by Niklas Koep.

file.  Offsets in ZIP file now are relative to the start of the archive in
conforming to the specification.

file.  Offsets in ZIP file now are relative to the start of the archive in
conforming to the specification.

compiling it.

compiling it.

assert_called, assert_not_called, and assert_called_once.

(Backported to 3.4 as this bug might be exploited to for DoS)

Do perturb shift after first conflict.

Issue #23749: With this change it's possible to implement starttls
as a separate package on PyPI, or even by copying/pasting a small
snipped of code in your project.

It's expected that we'll figure out the API design for starttls
during 3.6, so that we can add it in 3.7.