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
index ac6983f135c68adb646277ec8890d338a60545b9,367f37ee04d12a227e25cd680cda7d48ea0e7775..e7acc30781e58a2b748a6f90ea03a30557067e41
--- 1/Lib/test/test_zipfile.py
--- 2/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@@ -13,7 -19,8 +13,9 @@@ from tempfile import TemporaryFil
  from random import randint, random
  from unittest import skipUnless
  
- from test.support import TESTFN, run_unittest, findfile, unlink, requires_zlib, requires_bz2, requires_lzma
+ from test.support import (TESTFN, run_unittest, findfile, unlink,
 -                            captured_stdout)
++                          requires_zlib, requires_bz2, requires_lzma,
++                          captured_stdout)
  
  TESTFN2 = TESTFN + "2"
  TESTFNDIR = TESTFN + "d"

diff --cc Lib/zipfile.py
Simple merge

diff --cc Misc/ACKS
index 661d0ecaf36140abd534cada39d51095999162c0,7ed6b317ec71cc63f8252b36d620070afe3ce14d..17faa8ffb2274e09f0f1c35752669dfcfcb49e50
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -815,12 -739,11 +815,13 @@@ Florian Mladitsc
  Doug Moen
  The Dragon De Monsyne
  Skip Montanaro
 +Peter Moody
  Paul Moore
  Ross Moore
+ Ben Morgan
  Derek Morr
  James A Morrison
 +Derek McTavish Mounce
  Alessandro Moura
  Pablo Mouzo
  Mher Movsisyan

diff --cc Misc/NEWS
index 7ffc3f71d41145250f4a72693180fae9b4f9d368,7ebe3f8e471300509ef53624a504f65c09df0323..ce8c088fa6c894c63d964b804fac4351bac2ed29
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -164,9 -216,9 +164,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12004: Fix an internal error in PyZipFile when writing an invalid
+   Python file.  Patch by Ben Morgan.
+ 
 +- Issue #1602133: on Mac OS X a shared library build (``--enable-shared``)
 +  now fills the ``os.environ`` variable correctly.
 +
  - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase
    interface and support all mandatory methods and properties.