Merged revisions 73566 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73566 | gregory.p.smith | 2009-06-26 01:05:13 -0700 (Fri, 26 Jun 2009) | 14 lines

  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.
  ........
................

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index d2911e1184e4cc35c16b44e6df7c212687b81b5d..d50553e06e2455bf304ef6aa01c992287c1bfa3c 100644 (file)
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1119,7 +1119,7 @@ class ZipFile:
         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

diff --git a/Misc/NEWS b/Misc/NEWS
index 7a162824368dac565d5367ee16c0d338df2ca68d..d121d55fa730fd37a50b8a82581ddbe11f715050 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -195,6 +195,9 @@ Library
 
 - Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
   new arguments introduced in 2.5.
+  
+- Issue #1202: zipfile module would cause a DeprecationWarning when storing
+  files with a CRC32 > 2**31-1.
 
 Extension Modules
 -----------------