[Python-checkins] r73566 - in python/branches/py3k: Lib/zipfile.py Misc/NEWS

[gregory.p.smith]

Author: gregory.p.smith
Date: Fri Jun 26 10:05:13 2009
New Revision: 73566

Log:
Merged revisions 73565 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73565 | gregory.p.smith | 2009-06-26 00:50:21 -0700 (Fri, 26 Jun 2009) | 2 lines
  
  Fixes the last problem mentioned in issue1202.
........

Issue #1202: zipfile module would cause a struct.error when attempting to store
files with a CRC32 > 2**31-1.  (on trunk this was merely a warning, in the py3k
branch this caused an exception so I'm treating this as a release blocker and
merging it now)


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/zipfile.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/zipfile.py
==============================================================================
--- python/branches/py3k/Lib/zipfile.py	(original)
+++ python/branches/py3k/Lib/zipfile.py	Fri Jun 26 10:05:13 2009
@@ -1132,7 +1132,7 @@
         self.fp.flush()
         if zinfo.flag_bits & 0x08:
             # Write CRC and file sizes after the file data
-            self.fp.write(struct.pack("<lLL", zinfo.CRC, zinfo.compress_size,
+            self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
                   zinfo.file_size))
         self.filelist.append(zinfo)
         self.NameToInfo[zinfo.filename] = zinfo

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Jun 26 10:05:13 2009
@@ -32,6 +32,9 @@
 - Issue #6271: mmap tried to close invalid file handle (-1) when anonymous.
   (On Unix)
 
+- Issue #1202: zipfile module would cause a struct.error when attempting to
+  store files with a CRC32 > 2**31-1.
+
 Extension Modules
 -----------------