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

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Sep  6 01:43:02 2008
New Revision: 66241

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

........
  r66240 | antoine.pitrou | 2008-09-06 01:30:23 +0200 (sam., 06 sept. 2008) | 5 lines
  
  Issue #3535: zipfile couldn't read some zip files larger than 2GB.
  
  Reviewed by Amaury Forgeot d'Arc.
........


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	Sat Sep  6 01:43:02 2008
@@ -165,6 +165,7 @@
         return endrec
 
     # Update the original endrec using data from the ZIP64 record
+    endrec[_ECD_SIGNATURE] = sig
     endrec[_ECD_DISK_NUMBER] = disk_num
     endrec[_ECD_DISK_START] = disk_dir
     endrec[_ECD_ENTRIES_THIS_DISK] = dircount
@@ -733,9 +734,8 @@
 
         # "concat" is zero, unless zip was concatenated to another file
         concat = endrec[_ECD_LOCATION] - size_cd - offset_cd
-        if endrec[_ECD_LOCATION] > ZIP64_LIMIT:
-            # If the offset of the "End of Central Dir" record requires Zip64
-            # extension structures, account for them
+        if endrec[_ECD_SIGNATURE] == stringEndArchive64:
+            # If Zip64 extension structures are present, account for them
             concat -= (sizeEndCentDir64 + sizeEndCentDir64Locator)
 
         if self.debug > 2:

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Sep  6 01:43:02 2008
@@ -86,6 +86,13 @@
 Library
 -------
 
+- Issue #3535: zipfile couldn't read some zip files larger than 2GB.
+
+- Issue #3776: Deprecate the bsddb package for removal in 3.0.
+
+- Issue #3762: platform.architecture() fails if python is lanched via
+  its symbolic link.
+
 - Issue #3660: fix a memory leak in the C accelerator of the pickle module.
 
 - Issue #3160: the "bdist_wininst" distutils command didn't work.