From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 29 Jan 2013 18:14:08 +0000 (+0200)
Subject: Issue #12004: Fix an internal error in PyZipFile when writing an invalid
X-Git-Tag: v3.3.1rc1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5b75db5def1890924d914bc36b54e6a120bf2d7;p=thirdparty%2FPython%2Fcpython.git

Issue #12004: Fix an internal error in PyZipFile when writing an invalid
Python file.  Patch by Ben Morgan.
---

c5b75db5def1890924d914bc36b54e6a120bf2d7
diff --cc Lib/test/test_zipfile.py
index ac6983f135c6,367f37ee04d1..e7acc30781e5
--- a/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 Misc/ACKS
index 661d0ecaf361,7ed6b317ec71..17faa8ffb227
--- a/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 7ffc3f71d411,7ebe3f8e4713..ce8c088fa6c8
--- a/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.