Issue #12004: Fix an internal error in PyZipFile when writing an invalid

Python file.  Patch by Ben Morgan.

diff --cc Lib/test/test_zipfile.py
Simple merge

diff --cc Lib/zipfile.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index ef5c6bd9403a324b135dbd15defff37b2e96d009,ce8c088fa6c894c63d964b804fac4351bac2ed29..beee1c39f73499de242b4876a918c8a1767eacf9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -236,11 -164,9 +236,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12004: Fix an internal error in PyZipFile when writing an invalid
+   Python file.  Patch by Ben Morgan.
+ 
 +Have py_compile use importlib as much as possible to avoid code duplication.
 +
 +- Issue #180022: Have site.addpackage() consider already known paths even when
 +  none are explicitly passed in. Bug report and fix by Kirill.
 +
  - Issue #1602133: on Mac OS X a shared library build (``--enable-shared``)
    now fills the ``os.environ`` variable correctly.