[Python-checkins] r60116 - in python/trunk: Lib/zipfile.py Misc/NEWS

Sun Jan 20 00:10:53 CET 2008

Author: gregory.p.smith
Date: Sun Jan 20 00:10:52 2008
New Revision: 60116
Modified:
 python/trunk/Lib/zipfile.py
 python/trunk/Misc/NEWS
Log:
Fixes/Accepts Patch for issue1189216 - Work properly with archives
that have file headers past the 2**31 byte boundary.
Modified: python/trunk/Lib/zipfile.py
==============================================================================

--- python/trunk/Lib/zipfile.py	(original)
+++ python/trunk/Lib/zipfile.py	Sun Jan 20 00:10:52 2008
@@ -32,9 +32,9 @@
 # Other ZIP compression methods not supported
 
 # Here are some struct module formats for reading headers
-structEndArchive = "<4s4H2lH" # 9 items, end of archive, 22 bytes
+structEndArchive = "<4s4H2LH" # 9 items, end of archive, 22 bytes
 stringEndArchive = "PK005円006円" # magic number for end of archive record
-structCentralDir = "<4s4B4HlLL5HLl"# 19 items, central directory, 46 bytes
+structCentralDir = "<4s4B4HlLL5HLL"# 19 items, central directory, 46 bytes
 stringCentralDir = "PK001円002円" # magic number for central directory
 structFileHeader = "<4s2B4HlLL2H" # 12 items, file header record, 30 bytes
 stringFileHeader = "PK003円004円" # magic number for file header
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Jan 20 00:10:52 2008
@@ -369,6 +369,9 @@
 Library
 -------
 
+- #1189216: Fix the zipfile module to work on archives with headers
+ past the 2**31 byte boundary.
+
 - #1336: fix a race condition in subprocess.Popen if the garbage
 collector kicked in at the wrong time that would cause the process
 to hang when the child wrote to stderr.
