From: Gregory P. Smith <greg@mad-scientist.com>
Date: Fri, 26 Jun 2009 08:19:19 +0000 (+0000)
Subject: Merged revisions 73565 via svnmerge from
X-Git-Tag: v2.6.3rc1~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1e676497694a1eac837c270d62ae329faf0e893;p=python

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 a50a458336..e2ede45940 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1110,7 +1110,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 06cd333a3b..8cbdb19dd9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -128,6 +128,9 @@ Library
   makeunicodedata.py and regenerated the Unicode database (This fixes
   u'\u1d79'.lower() == '\x00').
 
+- Issue #1202: zipfile module would cause a DeprecationWarning when storing
+  files with a CRC32 > 2**31-1.
+
 Extension Modules
 -----------------