From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 9 Jun 2011 19:52:31 +0000 (-0400)
Subject: Merge #10694: zipfile now ignores garbage at the end of a zipfile.
X-Git-Tag: v3.3.0a1~2145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51fcb811e3169661d2995b1e6de6d1b46a7284c3;p=python

Merge #10694: zipfile now ignores garbage at the end of a zipfile.
---

51fcb811e3169661d2995b1e6de6d1b46a7284c3
diff --cc Misc/NEWS
index f422b2ddf5,2d00324e2e..dd7dedebf7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,11 -22,10 +187,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10694: zipfile now ignores garbage at the end of a zipfile.
+ 
  - Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA.
  
 +- Issue #10424: Argparse now includes the names of the missing required
 +  arguments in the missing arguments error message.
 +
  - Issue #12168: SysLogHandler now allows NUL termination to be controlled using
    a new 'append_nul' attribute on the handler.