[Python-checkins] r73567 - in python/branches/release30-maint: Lib/zipfile.py Misc/NEWS

[gregory.p.smith]

Author: gregory.p.smith
Date: Fri Jun 26 10:13:29 2009
New Revision: 73567

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


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/zipfile.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/zipfile.py
==============================================================================
--- python/branches/release30-maint/Lib/zipfile.py	(original)
+++ python/branches/release30-maint/Lib/zipfile.py	Fri Jun 26 10:13:29 2009
@@ -1119,7 +1119,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/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Fri Jun 26 10:13:29 2009
@@ -195,6 +195,9 @@
 
 - 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
 -----------------