cpython-lru_cache-weakref: Lib/zipfile.py annotate

annotate Lib/zipfile.py @ 78069:a8aa77458e12 3.2

Add c_size_t and c_ssize_t to the ctypes summary table.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 12 Jul 2012 20:31:50 +0200
parents	4186f20d9fa4
children	d51d95c9ea81 cac63f6ad252

rev	line source
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1 """
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	2 Read and write ZIP files.
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	3
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	4 XXX references to utf-8 need further investigation.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	5 """
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	6 import io
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	7 import os
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	8 import re
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	9 import imp
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	10 import sys
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	11 import time
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	12 import stat
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	13 import shutil
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	14 import struct
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	15 import binascii
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	16
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	17
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	18 try:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	19 import zlib # We may need its compression method
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	20 crc32 = zlib.crc32
17377 5f68754eb3b6 Try an except: after an import into "except ImportError". Guido van Rossum <guido@python.org> parents: 17312 diff changeset	21 except ImportError:
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	22 zlib = None
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	23 crc32 = binascii.crc32
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	24
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	25 __all__ = ["BadZipFile", "BadZipfile", "error", "ZIP_STORED", "ZIP_DEFLATED",
a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	26 "is_zipfile", "ZipInfo", "ZipFile", "PyZipFile", "LargeZipFile"]
16889 0feb63490093 final round of __all__ lists (I hope) - skipped urllib2 because Moshe may be Skip Montanaro <skip@pobox.com> parents: 16840 diff changeset	27
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	28 class BadZipFile(Exception):
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	29 pass
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	30
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	31
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	32 class LargeZipFile(Exception):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	33 """
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	34 Raised when writing a zipfile, the zipfile requires ZIP64 extensions
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	35 and those extensions are disabled.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	36 """
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	37
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	38 error = BadZipfile = BadZipFile # Pre-3.2 compatibility names
a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	39
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	40
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	41 ZIP64_LIMIT = (1 << 31) - 1
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	42 ZIP_FILECOUNT_LIMIT = 1 << 16
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	43 ZIP_MAX_COMMENT = (1 << 16) - 1
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	44
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	45 # constants for Zip file compression methods
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	46 ZIP_STORED = 0
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	47 ZIP_DEFLATED = 8
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	48 # Other ZIP compression methods not supported
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	49
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	50 # Below are some formats and associated data for reading/writing headers using
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	51 # the struct module. The names and structures of headers/records are those used
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	52 # in the PKWARE description of the ZIP file format:
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	53 # http://www.pkware.com/documents/casestudies/APPNOTE.TXT
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	54 # (URL valid as of January 2008)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	55
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	56 # The "end of central directory" structure, magic number, size, and indices
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	57 # (section V.I in the format document)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	58 structEndArchive = b"<4s4H2LH"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	59 stringEndArchive = b"PK\005\006"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	60 sizeEndCentDir = struct.calcsize(structEndArchive)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	61
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	62 _ECD_SIGNATURE = 0
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	63 _ECD_DISK_NUMBER = 1
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	64 _ECD_DISK_START = 2
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	65 _ECD_ENTRIES_THIS_DISK = 3
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	66 _ECD_ENTRIES_TOTAL = 4
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	67 _ECD_SIZE = 5
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	68 _ECD_OFFSET = 6
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	69 _ECD_COMMENT_SIZE = 7
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	70 # These last two indices are not part of the structure as defined in the
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	71 # spec, but they are used internally by this module as a convenience
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	72 _ECD_COMMENT = 8
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	73 _ECD_LOCATION = 9
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	74
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	75 # The "central directory" structure, magic number, size, and indices
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	76 # of entries in the structure (section V.F in the format document)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	77 structCentralDir = "<4s4B4HL2L5H2L"
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	78 stringCentralDir = b"PK\001\002"
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	79 sizeCentralDir = struct.calcsize(structCentralDir)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	80
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	81 # indexes of entries in the central directory structure
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	82 _CD_SIGNATURE = 0
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	83 _CD_CREATE_VERSION = 1
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	84 _CD_CREATE_SYSTEM = 2
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	85 _CD_EXTRACT_VERSION = 3
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	86 _CD_EXTRACT_SYSTEM = 4
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	87 _CD_FLAG_BITS = 5
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	88 _CD_COMPRESS_TYPE = 6
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	89 _CD_TIME = 7
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	90 _CD_DATE = 8
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	91 _CD_CRC = 9
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	92 _CD_COMPRESSED_SIZE = 10
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	93 _CD_UNCOMPRESSED_SIZE = 11
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	94 _CD_FILENAME_LENGTH = 12
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	95 _CD_EXTRA_FIELD_LENGTH = 13
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	96 _CD_COMMENT_LENGTH = 14
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	97 _CD_DISK_NUMBER_START = 15
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	98 _CD_INTERNAL_FILE_ATTRIBUTES = 16
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	99 _CD_EXTERNAL_FILE_ATTRIBUTES = 17
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	100 _CD_LOCAL_HEADER_OFFSET = 18
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	101
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	102 # The "local file header" structure, magic number, size, and indices
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	103 # (section V.A in the format document)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	104 structFileHeader = "<4s2B4HL2L2H"
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	105 stringFileHeader = b"PK\003\004"
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	106 sizeFileHeader = struct.calcsize(structFileHeader)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	107
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	108 _FH_SIGNATURE = 0
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	109 _FH_EXTRACT_VERSION = 1
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	110 _FH_EXTRACT_SYSTEM = 2
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	111 _FH_GENERAL_PURPOSE_FLAG_BITS = 3
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	112 _FH_COMPRESSION_METHOD = 4
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	113 _FH_LAST_MOD_TIME = 5
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	114 _FH_LAST_MOD_DATE = 6
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	115 _FH_CRC = 7
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	116 _FH_COMPRESSED_SIZE = 8
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	117 _FH_UNCOMPRESSED_SIZE = 9
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	118 _FH_FILENAME_LENGTH = 10
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	119 _FH_EXTRA_FIELD_LENGTH = 11
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	120
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	121 # The "Zip64 end of central directory locator" structure, magic number, and size
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	122 structEndArchive64Locator = "<4sLQL"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	123 stringEndArchive64Locator = b"PK\x06\x07"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	124 sizeEndCentDir64Locator = struct.calcsize(structEndArchive64Locator)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	125
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	126 # The "Zip64 end of central directory" record, magic number, size, and indices
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	127 # (section V.G in the format document)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	128 structEndArchive64 = "<4sQ2H2L4Q"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	129 stringEndArchive64 = b"PK\x06\x06"
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	130 sizeEndCentDir64 = struct.calcsize(structEndArchive64)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	131
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	132 _CD64_SIGNATURE = 0
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	133 _CD64_DIRECTORY_RECSIZE = 1
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	134 _CD64_CREATE_VERSION = 2
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	135 _CD64_EXTRACT_VERSION = 3
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	136 _CD64_DISK_NUMBER = 4
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	137 _CD64_DISK_NUMBER_START = 5
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	138 _CD64_NUMBER_ENTRIES_THIS_DISK = 6
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	139 _CD64_NUMBER_ENTRIES_TOTAL = 7
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	140 _CD64_DIRECTORY_SIZE = 8
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	141 _CD64_OFFSET_START_CENTDIR = 9
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	142
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	143 def _check_zipfile(fp):
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	144 try:
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	145 if _EndRecData(fp):
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	146 return True # file has correct magic number
17805 bf70d1f4f61f Fix one bare except: clause. Fred Drake <fdrake@acm.org> parents: 17517 diff changeset	147 except IOError:
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	148 pass
22867 e2f2187c3d2c Partial introduction of bools where appropriate. Guido van Rossum <guido@python.org> parents: 21251 diff changeset	149 return False
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	150
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	151 def is_zipfile(filename):
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	152 """Quickly see if a file is a ZIP file by checking the magic number.
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	153
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	154 The filename argument may be a file or file-like object too.
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	155 """
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	156 result = False
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	157 try:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	158 if hasattr(filename, "read"):
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	159 result = _check_zipfile(fp=filename)
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	160 else:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	161 with open(filename, "rb") as fp:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	162 result = _check_zipfile(fp)
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	163 except IOError:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	164 pass
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	165 return result
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 49037 diff changeset	166
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	167 def _EndRecData64(fpin, offset, endrec):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	168 """
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	169 Read the ZIP64 end-of-archive records and use that to update endrec
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	170 """
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	171 try:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	172 fpin.seek(offset - sizeEndCentDir64Locator, 2)
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	173 except IOError:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	174 # If the seek fails, the file is not large enough to contain a ZIP64
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	175 # end-of-archive record, so just return the end record we were given.
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	176 return endrec
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	177
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	178 data = fpin.read(sizeEndCentDir64Locator)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	179 sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data)
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	180 if sig != stringEndArchive64Locator:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	181 return endrec
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	182
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	183 if diskno != 0 or disks != 1:
65683 dc06aed9b984 Fix typo from r85874 Éric Araujo <merwok@netwok.org> parents: 65673 diff changeset	184 raise BadZipFile("zipfiles that span multiple disks are not supported")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	185
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	186 # Assume no 'zip64 extensible data'
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	187 fpin.seek(offset - sizeEndCentDir64Locator - sizeEndCentDir64, 2)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	188 data = fpin.read(sizeEndCentDir64)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	189 sig, sz, create_version, read_version, disk_num, disk_dir, \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	190 dircount, dircount2, dirsize, diroffset = \
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	191 struct.unpack(structEndArchive64, data)
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	192 if sig != stringEndArchive64:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	193 return endrec
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	194
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	195 # Update the original endrec using data from the ZIP64 record
49037 26bdd94a4293 Merged revisions 66240 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48728 diff changeset	196 endrec[_ECD_SIGNATURE] = sig
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	197 endrec[_ECD_DISK_NUMBER] = disk_num
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	198 endrec[_ECD_DISK_START] = disk_dir
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	199 endrec[_ECD_ENTRIES_THIS_DISK] = dircount
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	200 endrec[_ECD_ENTRIES_TOTAL] = dircount2
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	201 endrec[_ECD_SIZE] = dirsize
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	202 endrec[_ECD_OFFSET] = diroffset
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	203 return endrec
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	204
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	205
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	206 def _EndRecData(fpin):
63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	207 """Return data from the "End of Central Directory" record, or None.
63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	208
63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	209 The data is a list of the nine items in the ZIP "End of central dir"
63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	210 record followed by a tenth item, the file seek offset of this record."""
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	211
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	212 # Determine file size
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	213 fpin.seek(0, 2)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	214 filesize = fpin.tell()
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	215
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	216 # Check to see if this is ZIP file with no archive comment (the
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	217 # "end of central directory" structure should be the last item in the
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	218 # file if this is the case).
58176 b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 56223 diff changeset	219 try:
b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 56223 diff changeset	220 fpin.seek(-sizeEndCentDir, 2)
b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 56223 diff changeset	221 except IOError:
b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 56223 diff changeset	222 return None
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	223 data = fpin.read()
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	224 if data[0:4] == stringEndArchive and data[-2:] == b"\000\000":
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	225 # the signature is correct and there's no comment, unpack structure
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	226 endrec = struct.unpack(structEndArchive, data)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	227 endrec=list(endrec)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	228
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	229 # Append a blank comment and record start offset
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	230 endrec.append(b"")
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	231 endrec.append(filesize - sizeEndCentDir)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	232
50847 4288546a4238 Merged revisions 68678 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50825 diff changeset	233 # Try to read the "Zip64 end of central directory" structure
4288546a4238 Merged revisions 68678 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50825 diff changeset	234 return _EndRecData64(fpin, -sizeEndCentDir, endrec)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	235
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	236 # Either this is not a ZIP file, or it is a ZIP file with an archive
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	237 # comment. Search the end of the file for the "end of central directory"
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	238 # record signature. The comment is the last item in the ZIP file and may be
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	239 # up to 64K long. It is assumed that the "end of central directory" magic
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	240 # number does not appear in the comment.
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	241 maxCommentStart = max(filesize - (1 << 16) - sizeEndCentDir, 0)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	242 fpin.seek(maxCommentStart, 0)
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	243 data = fpin.read()
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	244 start = data.rfind(stringEndArchive)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	245 if start >= 0:
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	246 # found the magic number; attempt to unpack and interpret
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	247 recData = data[start:start+sizeEndCentDir]
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	248 endrec = list(struct.unpack(structEndArchive, recData))
70746 7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	249 commentSize = endrec[_ECD_COMMENT_SIZE] #as claimed by the zip file
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	250 comment = data[start+sizeEndCentDir:start+sizeEndCentDir+commentSize]
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	251 endrec.append(comment)
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	252 endrec.append(maxCommentStart + start)
50847 4288546a4238 Merged revisions 68678 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50825 diff changeset	253
70746 7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	254 # Try to read the "Zip64 end of central directory" structure
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	255 return _EndRecData64(fpin, maxCommentStart + start - filesize,
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70215 diff changeset	256 endrec)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	257
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	258 # Unable to find a valid end of central directory structure
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	259 return
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	260
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	261
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	262 class ZipInfo (object):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	263 """Class with attributes describing each file in the ZIP archive."""
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	264
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	265 __slots__ = (
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	266 'orig_filename',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	267 'filename',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	268 'date_time',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	269 'compress_type',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	270 'comment',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	271 'extra',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	272 'create_system',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	273 'create_version',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	274 'extract_version',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	275 'reserved',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	276 'flag_bits',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	277 'volume',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	278 'internal_attr',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	279 'external_attr',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	280 'header_offset',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	281 'CRC',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	282 'compress_size',
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	283 'file_size',
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	284 '_raw_time',
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	285 )
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	286
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	287 def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
29523 87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	288 self.orig_filename = filename # Original file name in archive
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	289
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	290 # Terminate the file name at the first null byte. Null bytes in file
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	291 # names are used as tricks by viruses in archives.
29523 87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	292 null_byte = filename.find(chr(0))
87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	293 if null_byte >= 0:
87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	294 filename = filename[0:null_byte]
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	295 # This is used to ensure paths in generated ZIP files always use
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	296 # forward slashes as the directory separator, as required by the
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	297 # ZIP format specification.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	298 if os.sep != "/" and os.sep in filename:
29523 87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	299 filename = filename.replace(os.sep, "/")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	300
29523 87f30fcfad48 SF patch #755987 (Jim Ahlstrom): Greg Ward <gward@python.net> parents: 27250 diff changeset	301 self.filename = filename # Normalized file name
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	302 self.date_time = date_time # year, month, day, hour, min, sec
72992 12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70746 diff changeset	303
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70746 diff changeset	304 if date_time[0] < 1980:
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70746 diff changeset	305 raise ValueError('ZIP does not support timestamps before 1980')
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70746 diff changeset	306
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	307 # Standard values:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	308 self.compress_type = ZIP_STORED # Type of compression for the file
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	309 self.comment = b"" # Comment for each file
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	310 self.extra = b"" # ZIP extra data
36449 4ed30eaa0256 Patch #1412872: zipfile: use correct system type on unixy systems. Martin v. Löwis <martin@v.loewis.de> parents: 34594 diff changeset	311 if sys.platform == 'win32':
4ed30eaa0256 Patch #1412872: zipfile: use correct system type on unixy systems. Martin v. Löwis <martin@v.loewis.de> parents: 34594 diff changeset	312 self.create_system = 0 # System which created ZIP archive
4ed30eaa0256 Patch #1412872: zipfile: use correct system type on unixy systems. Martin v. Löwis <martin@v.loewis.de> parents: 34594 diff changeset	313 else:
4ed30eaa0256 Patch #1412872: zipfile: use correct system type on unixy systems. Martin v. Löwis <martin@v.loewis.de> parents: 34594 diff changeset	314 # Assume everything else is unix-y
4ed30eaa0256 Patch #1412872: zipfile: use correct system type on unixy systems. Martin v. Löwis <martin@v.loewis.de> parents: 34594 diff changeset	315 self.create_system = 3 # System which created ZIP archive
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	316 self.create_version = 20 # Version which created ZIP archive
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	317 self.extract_version = 20 # Version needed to extract archive
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	318 self.reserved = 0 # Must be zero
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	319 self.flag_bits = 0 # ZIP flag bits
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	320 self.volume = 0 # Volume number of file header
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	321 self.internal_attr = 0 # Internal attributes
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	322 self.external_attr = 0 # External file attributes
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	323 # Other attributes are set by class ZipFile:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	324 # header_offset Byte offset to the file header
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	325 # CRC CRC-32 of the uncompressed file
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	326 # compress_size Size of the compressed file
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	327 # file_size Size of the uncompressed file
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	328
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	329 def FileHeader(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	330 """Return the per-file header as a string."""
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	331 dt = self.date_time
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	332 dosdate = (dt[0] - 1980) << 9 \| dt[1] << 5 \| dt[2]
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21098 diff changeset	333 dostime = dt[3] << 11 \| dt[4] << 5 \| (dt[5] // 2)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	334 if self.flag_bits & 0x08:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	335 # Set these to zero because we write them after the file data
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	336 CRC = compress_size = file_size = 0
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	337 else:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	338 CRC = self.CRC
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	339 compress_size = self.compress_size
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	340 file_size = self.file_size
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	341
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	342 extra = self.extra
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	343
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	344 if file_size > ZIP64_LIMIT or compress_size > ZIP64_LIMIT:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	345 # File is larger than what fits into a 4 byte integer,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	346 # fall back to the ZIP64 extension
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	347 fmt = '<HHQQ'
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	348 extra = extra + struct.pack(fmt,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	349 1, struct.calcsize(fmt)-4, file_size, compress_size)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	350 file_size = 0xffffffff
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	351 compress_size = 0xffffffff
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	352 self.extract_version = max(45, self.extract_version)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	353 self.create_version = max(45, self.extract_version)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	354
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	355 filename, flag_bits = self._encodeFilenameFlags()
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	356 header = struct.pack(structFileHeader, stringFileHeader,
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	357 self.extract_version, self.reserved, flag_bits,
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	358 self.compress_type, dostime, dosdate, CRC,
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	359 compress_size, file_size,
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	360 len(filename), len(extra))
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	361 return header + filename + extra
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	362
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	363 def _encodeFilenameFlags(self):
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	364 try:
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	365 return self.filename.encode('ascii'), self.flag_bits
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	366 except UnicodeEncodeError:
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	367 return self.filename.encode('utf-8'), self.flag_bits \| 0x800
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	368
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	369 def _decodeExtra(self):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	370 # Try to decode the extra field.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	371 extra = self.extra
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	372 unpack = struct.unpack
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	373 while extra:
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	374 tp, ln = unpack('<HH', extra[:4])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	375 if tp == 1:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	376 if ln >= 24:
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	377 counts = unpack('<QQQ', extra[4:28])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	378 elif ln == 16:
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	379 counts = unpack('<QQ', extra[4:20])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	380 elif ln == 8:
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	381 counts = unpack('<Q', extra[4:12])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	382 elif ln == 0:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	383 counts = ()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	384 else:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	385 raise RuntimeError("Corrupt extra field %s"%(ln,))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	386
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	387 idx = 0
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	388
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	389 # ZIP64 extension (large files and/or large archives)
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	390 if self.file_size in (0xffffffffffffffff, 0xffffffff):
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	391 self.file_size = counts[idx]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	392 idx += 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	393
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	394 if self.compress_size == 0xFFFFFFFF:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	395 self.compress_size = counts[idx]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	396 idx += 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	397
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	398 if self.header_offset == 0xffffffff:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	399 old = self.header_offset
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	400 self.header_offset = counts[idx]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	401 idx+=1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	402
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	403 extra = extra[ln+4:]
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	404
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	405
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	406 class _ZipDecrypter:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	407 """Class to handle decryption of files stored within a ZIP archive.
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	408
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	409 ZIP supports a password-based form of encryption. Even though known
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	410 plaintext attacks have been found against it, it is still useful
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	411 to be able to get data out of such a file.
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	412
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	413 Usage:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	414 zd = _ZipDecrypter(mypwd)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	415 plain_char = zd(cypher_char)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	416 plain_text = map(zd, cypher_text)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	417 """
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	418
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	419 def _GenerateCRCTable():
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	420 """Generate a CRC-32 table.
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	421
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	422 ZIP encryption uses the CRC32 one-byte primitive for scrambling some
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	423 internal keys. We noticed that a direct implementation is faster than
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	424 relying on binascii.crc32().
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	425 """
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	426 poly = 0xedb88320
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	427 table = [0] * 256
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	428 for i in range(256):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	429 crc = i
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	430 for j in range(8):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	431 if crc & 1:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	432 crc = ((crc >> 1) & 0x7FFFFFFF) ^ poly
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	433 else:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	434 crc = ((crc >> 1) & 0x7FFFFFFF)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	435 table[i] = crc
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	436 return table
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	437 crctable = _GenerateCRCTable()
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	438
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	439 def _crc32(self, ch, crc):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	440 """Compute the CRC32 primitive on one byte."""
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	441 return ((crc >> 8) & 0xffffff) ^ self.crctable[(crc ^ ch) & 0xff]
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	442
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	443 def __init__(self, pwd):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	444 self.key0 = 305419896
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	445 self.key1 = 591751049
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	446 self.key2 = 878082192
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	447 for p in pwd:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	448 self._UpdateKeys(p)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	449
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	450 def _UpdateKeys(self, c):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	451 self.key0 = self._crc32(c, self.key0)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	452 self.key1 = (self.key1 + (self.key0 & 255)) & 4294967295
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	453 self.key1 = (self.key1 * 134775813 + 1) & 4294967295
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	454 self.key2 = self._crc32((self.key1 >> 24) & 255, self.key2)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	455
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	456 def __call__(self, c):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	457 """Decrypt a single character."""
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	458 assert isinstance(c, int)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	459 k = self.key2 \| 2
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	460 c = c ^ (((k * (k^1)) >> 8) & 255)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	461 self._UpdateKeys(c)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	462 return c
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	463
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	464 class ZipExtFile(io.BufferedIOBase):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	465 """File-like object for reading an archive member.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	466 Is returned by ZipFile.open().
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	467 """
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	468
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	469 # Max size supported by decompressor.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	470 MAX_N = 1 << 31 - 1
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	471
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	472 # Read from compressed files in 4k blocks.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	473 MIN_READ_SIZE = 4096
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	474
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	475 # Search for universal newlines or line chunks.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	476 PATTERN = re.compile(br'^(?P<chunk>[^\r\n]+)\|(?P<newline>\n\|\r\n?)')
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	477
66408 2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	478 def __init__(self, fileobj, mode, zipinfo, decrypter=None,
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	479 close_fileobj=False):
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	480 self._fileobj = fileobj
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	481 self._decrypter = decrypter
66408 2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	482 self._close_fileobj = close_fileobj
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	483
58552 245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	484 self._compress_type = zipinfo.compress_type
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	485 self._compress_size = zipinfo.compress_size
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	486 self._compress_left = zipinfo.compress_size
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	487
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	488 if self._compress_type == ZIP_DEFLATED:
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	489 self._decompressor = zlib.decompressobj(-15)
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	490 self._unconsumed = b''
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	491
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	492 self._readbuffer = b''
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	493 self._offset = 0
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	494
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	495 self._universal = 'U' in mode
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	496 self.newlines = None
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	497
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	498 # Adjust read size for encrypted files since the first 12 bytes
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	499 # are for the encryption/password information.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	500 if self._decrypter is not None:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	501 self._compress_left -= 12
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	502
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	503 self.mode = mode
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	504 self.name = zipinfo.filename
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	505
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	506 if hasattr(zipinfo, 'CRC'):
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	507 self._expected_crc = zipinfo.CRC
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	508 self._running_crc = crc32(b'') & 0xffffffff
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	509 else:
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	510 self._expected_crc = None
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	511
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	512 def readline(self, limit=-1):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	513 """Read and return a line from the stream.
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	514
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	515 If limit is specified, at most limit bytes will be read.
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	516 """
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	517
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	518 if not self._universal and limit < 0:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	519 # Shortcut common case - newline found in buffer.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	520 i = self._readbuffer.find(b'\n', self._offset) + 1
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	521 if i > 0:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	522 line = self._readbuffer[self._offset: i]
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	523 self._offset = i
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	524 return line
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	525
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	526 if not self._universal:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	527 return io.BufferedIOBase.readline(self, limit)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	528
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	529 line = b''
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	530 while limit < 0 or len(line) < limit:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	531 readahead = self.peek(2)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	532 if readahead == b'':
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	533 return line
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	534
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	535 #
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	536 # Search for universal newlines or line chunks.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	537 #
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	538 # The pattern returns either a line chunk or a newline, but not
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	539 # both. Combined with peek(2), we are assured that the sequence
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	540 # '\r\n' is always retrieved completely and never split into
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	541 # separate newlines - '\r', '\n' due to coincidental readaheads.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	542 #
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	543 match = self.PATTERN.search(readahead)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	544 newline = match.group('newline')
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	545 if newline is not None:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	546 if self.newlines is None:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	547 self.newlines = []
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	548 if newline not in self.newlines:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	549 self.newlines.append(newline)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	550 self._offset += len(newline)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	551 return line + b'\n'
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	552
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	553 chunk = match.group('chunk')
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	554 if limit >= 0:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	555 chunk = chunk[: limit - len(line)]
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	556
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	557 self._offset += len(chunk)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	558 line += chunk
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	559
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	560 return line
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	561
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	562 def peek(self, n=1):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	563 """Returns buffered bytes without advancing the position."""
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	564 if n > len(self._readbuffer) - self._offset:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	565 chunk = self.read(n)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	566 self._offset -= len(chunk)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	567
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	568 # Return up to 512 bytes to reduce allocation overhead for tight loops.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	569 return self._readbuffer[self._offset: self._offset + 512]
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	570
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	571 def readable(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	572 return True
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	573
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	574 def read(self, n=-1):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	575 """Read and return up to n bytes.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	576 If the argument is omitted, None, or negative, data is read and returned until EOF is reached..
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	577 """
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	578 buf = b''
64672 fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	579 if n is None:
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	580 n = -1
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	581 while True:
64672 fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	582 if n < 0:
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	583 data = self.read1(n)
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	584 elif n > len(buf):
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	585 data = self.read1(n - len(buf))
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	586 else:
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	587 return buf
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	588 if len(data) == 0:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	589 return buf
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	590 buf += data
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	591
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	592 def _update_crc(self, newdata, eof):
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	593 # Update the CRC using the given data.
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	594 if self._expected_crc is None:
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	595 # No need to compute the CRC if we don't have a reference value
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	596 return
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	597 self._running_crc = crc32(newdata, self._running_crc) & 0xffffffff
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	598 # Check the CRC if we're at the end of the file
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	599 if eof and self._running_crc != self._expected_crc:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	600 raise BadZipFile("Bad CRC-32 for file %r" % self.name)
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	601
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	602 def read1(self, n):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	603 """Read up to n bytes with at most one read() system call."""
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	604
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	605 # Simplify algorithm (branching) by transforming negative n to large n.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	606 if n < 0 or n is None:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	607 n = self.MAX_N
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	608
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	609 # Bytes available in read buffer.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	610 len_readbuffer = len(self._readbuffer) - self._offset
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	611
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	612 # Read from file.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	613 if self._compress_left > 0 and n > len_readbuffer + len(self._unconsumed):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	614 nbytes = n - len_readbuffer - len(self._unconsumed)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	615 nbytes = max(nbytes, self.MIN_READ_SIZE)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	616 nbytes = min(nbytes, self._compress_left)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	617
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	618 data = self._fileobj.read(nbytes)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	619 self._compress_left -= len(data)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	620
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	621 if data and self._decrypter is not None:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	622 data = bytes(map(self._decrypter, data))
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	623
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	624 if self._compress_type == ZIP_STORED:
63933 fd4606efc700 Issue #7467: when a file from a ZIP archive, its CRC is checked and a Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	625 self._update_crc(data, eof=(self._compress_left==0))
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	626 self._readbuffer = self._readbuffer[self._offset:] + data
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	627 self._offset = 0
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	628 else:
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	629 # Prepare deflated bytes for decompression.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	630 self._unconsumed += data
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	631
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	632 # Handle unconsumed data.
58552 245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	633 if (len(self._unconsumed) > 0 and n > len_readbuffer and
245f36282113 Merged revisions 77809 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58542 diff changeset	634 self._compress_type == ZIP_DEFLATED):
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	635 data = self._decompressor.decompress(
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	636 self._unconsumed,
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	637 max(n - len_readbuffer, self.MIN_READ_SIZE)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	638 )
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	639
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	640 self._unconsumed = self._decompressor.unconsumed_tail
63933 fd4606efc700 Issue #7467: when a file from a ZIP archive, its CRC is checked and a Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	641 eof = len(self._unconsumed) == 0 and self._compress_left == 0
fd4606efc700 Issue #7467: when a file from a ZIP archive, its CRC is checked and a Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	642 if eof:
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	643 data += self._decompressor.flush()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	644
63933 fd4606efc700 Issue #7467: when a file from a ZIP archive, its CRC is checked and a Antoine Pitrou <solipsis@pitrou.net> parents: 60648 diff changeset	645 self._update_crc(data, eof=eof)
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	646 self._readbuffer = self._readbuffer[self._offset:] + data
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	647 self._offset = 0
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	648
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	649 # Read from buffer.
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	650 data = self._readbuffer[self._offset: self._offset + n]
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58004 diff changeset	651 self._offset += len(data)
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	652 return data
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	653
66408 2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	654 def close(self):
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	655 try:
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	656 if self._close_fileobj:
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	657 self._fileobj.close()
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	658 finally:
2c370065c1b4 Issue #9846: ZipExtFile provides no mechanism for closing the underlying file object Łukasz Langa <lukasz@langa.pl> parents: 65830 diff changeset	659 super().close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	660
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	661
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	662 class ZipFile:
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	663 """ Class with methods to open, read, write, close, list zip files.
0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	664
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	665 z = ZipFile(file, mode="r", compression=ZIP_STORED, allowZip64=False)
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	666
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	667 file: Either the path to the file, or a file-like object.
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	668 If it is a path, the file will be opened and closed by ZipFile.
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	669 mode: The mode can be either read "r", write "w" or append "a".
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	670 compression: ZIP_STORED (no compression) or ZIP_DEFLATED (requires zlib).
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	671 allowZip64: if True ZipFile will create files with ZIP64 extensions when
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	672 needed, otherwise it will raise an exception when this would
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	673 be necessary.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	674
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	675 """
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	676
16826 a95693491eca Fix SF tracker bug #403871: AttributeError in ZipFile.__del__() when Fred Drake <fdrake@acm.org> parents: 15874 diff changeset	677 fp = None # Set here since __del__ checks it
a95693491eca Fix SF tracker bug #403871: AttributeError in ZipFile.__del__() when Fred Drake <fdrake@acm.org> parents: 15874 diff changeset	678
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	679 def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=False):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	680 """Open the ZIP file with mode read "r", write "w" or append "a"."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	681 if mode not in ("r", "w", "a"):
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	682 raise RuntimeError('ZipFile() requires mode "r", "w", or "a"')
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	683
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	684 if compression == ZIP_STORED:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	685 pass
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	686 elif compression == ZIP_DEFLATED:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	687 if not zlib:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	688 raise RuntimeError(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	689 "Compression requires the (missing) zlib module")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	690 else:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	691 raise RuntimeError("That compression method is not supported")
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	692
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	693 self._allowZip64 = allowZip64
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	694 self._didModify = False
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	695 self.debug = 0 # Level of printing: 0 through 3
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	696 self.NameToInfo = {} # Find file info given name
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	697 self.filelist = [] # List of ZipInfo instances for archive
4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	698 self.compression = compression # Method of compression
34594 32b89606f0cd Remove dependency on order of mode flags Raymond Hettinger <python@rcn.com> parents: 33914 diff changeset	699 self.mode = key = mode.replace('b', '')[0]
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	700 self.pwd = None
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	701 self._comment = b''
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	702
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	703 # Check if we were passed a file-like object
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43020 diff changeset	704 if isinstance(file, str):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	705 # No, it's a filename
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	706 self._filePassed = 0
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	707 self.filename = file
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	708 modeDict = {'r' : 'rb', 'w': 'wb', 'a' : 'r+b'}
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	709 try:
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	710 self.fp = io.open(file, modeDict[mode])
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	711 except IOError:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	712 if mode == 'a':
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	713 mode = key = 'w'
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	714 self.fp = io.open(file, modeDict[mode])
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	715 else:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	716 raise
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	717 else:
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	718 self._filePassed = 1
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	719 self.fp = file
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	720 self.filename = getattr(file, 'name', None)
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	721
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	722 if key == 'r':
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	723 self._GetContents()
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	724 elif key == 'w':
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	725 # set the modified flag so central directory gets written
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	726 # even if no files are added to the archive
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	727 self._didModify = True
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	728 elif key == 'a':
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	729 try:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	730 # See if file is a zip file
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	731 self._RealGetContents()
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	732 # seek to start of directory and overwrite
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	733 self.fp.seek(self.start_dir, 0)
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	734 except BadZipFile:
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	735 # file is not a zip file, just append
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	736 self.fp.seek(0, 2)
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	737
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	738 # set the modified flag so central directory gets written
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	739 # even if no files are added to the archive
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	740 self._didModify = True
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	741 else:
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	742 if not self._filePassed:
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	743 self.fp.close()
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	744 self.fp = None
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	745 raise RuntimeError('Mode must be "r", "w" or "a"')
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	746
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	747 def __enter__(self):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	748 return self
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	749
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	750 def __exit__(self, type, value, traceback):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	751 self.close()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56222 diff changeset	752
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	753 def _GetContents(self):
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	754 """Read the directory, making sure we close the file if the format
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	755 is bad."""
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	756 try:
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	757 self._RealGetContents()
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	758 except BadZipFile:
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	759 if not self._filePassed:
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	760 self.fp.close()
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	761 self.fp = None
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	762 raise
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	763
7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	764 def _RealGetContents(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	765 """Read in the table of contents for the ZIP file."""
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	766 fp = self.fp
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	767 try:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	768 endrec = _EndRecData(fp)
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 63936 diff changeset	769 except IOError:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	770 raise BadZipFile("File is not a zip file")
25756 63225811498d Patch #611760: read archives with comments. Martin v. Löwis <martin@v.loewis.de> parents: 24756 diff changeset	771 if not endrec:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	772 raise BadZipFile("File is not a zip file")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	773 if self.debug > 1:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	774 print(endrec)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	775 size_cd = endrec[_ECD_SIZE] # bytes in central directory
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	776 offset_cd = endrec[_ECD_OFFSET] # offset of central directory
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	777 self._comment = endrec[_ECD_COMMENT] # archive comment
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	778
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	779 # "concat" is zero, unless zip was concatenated to another file
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	780 concat = endrec[_ECD_LOCATION] - size_cd - offset_cd
49037 26bdd94a4293 Merged revisions 66240 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48728 diff changeset	781 if endrec[_ECD_SIGNATURE] == stringEndArchive64:
26bdd94a4293 Merged revisions 66240 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48728 diff changeset	782 # If Zip64 extension structures are present, account for them
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	783 concat -= (sizeEndCentDir64 + sizeEndCentDir64Locator)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	784
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	785 if self.debug > 2:
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	786 inferred = concat + offset_cd
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	787 print("given, inferred, offset", offset_cd, inferred, concat)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	788 # self.start_dir: Position of start of central directory
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	789 self.start_dir = offset_cd + concat
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	790 fp.seek(self.start_dir, 0)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	791 data = fp.read(size_cd)
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	792 fp = io.BytesIO(data)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	793 total = 0
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	794 while total < size_cd:
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	795 centdir = fp.read(sizeCentralDir)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	796 if centdir[0:4] != stringCentralDir:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	797 raise BadZipFile("Bad magic number for central directory")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	798 centdir = struct.unpack(structCentralDir, centdir)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	799 if self.debug > 2:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	800 print(centdir)
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	801 filename = fp.read(centdir[_CD_FILENAME_LENGTH])
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	802 flags = centdir[5]
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	803 if flags & 0x800:
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	804 # UTF-8 file names extension
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	805 filename = filename.decode('utf-8')
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	806 else:
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	807 # Historical ZIP filename encoding
15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	808 filename = filename.decode('cp437')
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	809 # Create ZipInfo instance to store file information
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	810 x = ZipInfo(filename)
16840 950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	811 x.extra = fp.read(centdir[_CD_EXTRA_FIELD_LENGTH])
950fc2261da4 Define lots of constants for indexes into the structures for the file Fred Drake <fdrake@acm.org> parents: 16826 diff changeset	812 x.comment = fp.read(centdir[_CD_COMMENT_LENGTH])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	813 x.header_offset = centdir[_CD_LOCAL_HEADER_OFFSET]
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	814 (x.create_version, x.create_system, x.extract_version, x.reserved,
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	815 x.flag_bits, x.compress_type, t, d,
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	816 x.CRC, x.compress_size, x.file_size) = centdir[1:12]
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	817 x.volume, x.internal_attr, x.external_attr = centdir[15:18]
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	818 # Convert date/time code to (year, month, day, hour, min, sec)
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	819 x._raw_time = t
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	820 x.date_time = ( (d>>9)+1980, (d>>5)&0xF, d&0x1F,
12919 31c725d70e65 James C. Ahlstron <jim@interet.com>: Fred Drake <fdrake@acm.org> parents: 12197 diff changeset	821 t>>11, (t>>5)&0x3F, (t&0x1F) * 2 )
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	822
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	823 x._decodeExtra()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	824 x.header_offset = x.header_offset + concat
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	825 self.filelist.append(x)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	826 self.NameToInfo[x.filename] = x
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	827
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	828 # update total bytes read from central directory
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	829 total = (total + sizeCentralDir + centdir[_CD_FILENAME_LENGTH]
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	830 + centdir[_CD_EXTRA_FIELD_LENGTH]
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	831 + centdir[_CD_COMMENT_LENGTH])
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	832
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	833 if self.debug > 2:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	834 print("total", total)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	835
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	836
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	837 def namelist(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	838 """Return a list of file names in the archive."""
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	839 l = []
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	840 for data in self.filelist:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	841 l.append(data.filename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	842 return l
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	843
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	844 def infolist(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	845 """Return a list of class ZipInfo instances for files in the
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	846 archive."""
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	847 return self.filelist
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	848
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	849 def printdir(self, file=None):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	850 """Print a table of contents for the zip file."""
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	851 print("%-46s %19s %12s" % ("File Name", "Modified ", "Size"),
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	852 file=file)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	853 for zinfo in self.filelist:
44699 6f049ca55e06 Merged revisions 59952-59984 via svnmerge from Guido van Rossum <guido@python.org> parents: 44587 diff changeset	854 date = "%d-%02d-%02d %02d:%02d:%02d" % zinfo.date_time[:6]
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	855 print("%-46s %s %12d" % (zinfo.filename, date, zinfo.file_size),
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	856 file=file)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	857
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	858 def testzip(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	859 """Read all the files and check the CRC."""
48728 06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	860 chunk_size = 2 ** 20
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	861 for zinfo in self.filelist:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	862 try:
48728 06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	863 # Read by chunks, to avoid an OverflowError or a
06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	864 # MemoryError with very large embedded files.
06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	865 f = self.open(zinfo.filename, "r")
06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	866 while f.read(chunk_size): # Check CRC-32
06891aec41de Merged revisions 65659,65693,65700,65702,65706-65707,65761 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48572 diff changeset	867 pass
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	868 except BadZipFile:
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	869 return zinfo.filename
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	870
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	871 def getinfo(self, name):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	872 """Return the instance of ZipInfo given 'name'."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	873 info = self.NameToInfo.get(name)
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	874 if info is None:
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	875 raise KeyError(
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	876 'There is no item named %r in the archive' % name)
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	877
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	878 return info
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	879
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	880 def setpassword(self, pwd):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	881 """Set default password for encrypted files."""
67077 561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	882 if pwd and not isinstance(pwd, bytes):
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	883 raise TypeError("pwd: expected bytes, got %s" % type(pwd))
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	884 if pwd:
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	885 self.pwd = pwd
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	886 else:
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	887 self.pwd = None
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	888
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	889 @property
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	890 def comment(self):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	891 """The comment text associated with the ZIP file."""
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	892 return self._comment
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	893
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	894 @comment.setter
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	895 def comment(self, comment):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	896 if not isinstance(comment, bytes):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	897 raise TypeError("comment: expected bytes, got %s" % type(comment))
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	898 # check for valid comment length
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	899 if len(comment) >= ZIP_MAX_COMMENT:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	900 if self.debug:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	901 print('Archive comment is too long; truncating to %d bytes'
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	902 % ZIP_MAX_COMMENT)
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	903 comment = comment[:ZIP_MAX_COMMENT]
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	904 self._comment = comment
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	905 self._didModify = True
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	906
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	907 def read(self, name, pwd=None):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	908 """Return file bytes (as a string) for name."""
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65683 diff changeset	909 with self.open(name, "r", pwd) as fp:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65683 diff changeset	910 return fp.read()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	911
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	912 def open(self, name, mode="r", pwd=None):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	913 """Return file-like object for 'name'."""
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	914 if mode not in ("r", "U", "rU"):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	915 raise RuntimeError('open() requires mode "r", "U", or "rU"')
67077 561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	916 if pwd and not isinstance(pwd, bytes):
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	917 raise TypeError("pwd: expected bytes, got %s" % type(pwd))
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	918 if not self.fp:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	919 raise RuntimeError(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	920 "Attempt to read ZIP archive that was already closed")
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	921
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	922 # Only open a new file for instances where we were not
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	923 # given a file object in the constructor
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	924 if self._filePassed:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	925 zef_file = self.fp
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	926 else:
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41760 diff changeset	927 zef_file = io.open(self.filename, 'rb')
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	928
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	929 # Make sure we have an info object
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	930 if isinstance(name, ZipInfo):
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	931 # 'name' is already an info object
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	932 zinfo = name
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	933 else:
f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	934 # Get info object for name
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	935 try:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	936 zinfo = self.getinfo(name)
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	937 except KeyError:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	938 if not self._filePassed:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	939 zef_file.close()
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	940 raise
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	941 zef_file.seek(zinfo.header_offset, 0)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	942
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	943 # Skip the file header:
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	944 fheader = zef_file.read(sizeFileHeader)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	945 if fheader[0:4] != stringFileHeader:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	946 raise BadZipFile("Bad magic number for file header")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	947
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	948 fheader = struct.unpack(structFileHeader, fheader)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	949 fname = zef_file.read(fheader[_FH_FILENAME_LENGTH])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	950 if fheader[_FH_EXTRA_FIELD_LENGTH]:
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	951 zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	952
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	953 if zinfo.flag_bits & 0x800:
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	954 # UTF-8 filename
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	955 fname_str = fname.decode("utf-8")
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	956 else:
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	957 fname_str = fname.decode("cp437")
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	958
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67077 diff changeset	959 if fname_str != zinfo.orig_filename:
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	960 if not self._filePassed:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	961 zef_file.close()
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	962 raise BadZipFile(
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	963 'File name in directory %r and header %r differ.'
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	964 % (zinfo.orig_filename, fname))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	965
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	966 # check for encrypted flag & handle password
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	967 is_encrypted = zinfo.flag_bits & 0x1
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	968 zd = None
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	969 if is_encrypted:
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	970 if not pwd:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	971 pwd = self.pwd
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	972 if not pwd:
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	973 if not self._filePassed:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	974 zef_file.close()
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	975 raise RuntimeError("File %s is encrypted, "
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	976 "password required for extraction" % name)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	977
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	978 zd = _ZipDecrypter(pwd)
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	979 # The first 12 bytes in the cypher stream is an encryption header
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	980 # used to strengthen the algorithm. The first 11 bytes are
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	981 # completely random, while the 12th contains the MSB of the CRC,
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	982 # or the MSB of the file time depending on the header type
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40775 diff changeset	983 # and is used to check the correctness of the password.
67077 561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	984 header = zef_file.read(12)
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	985 h = list(map(zd, header[0:12]))
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	986 if zinfo.flag_bits & 0x8:
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	987 # compare against the file type from extended local headers
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	988 check_byte = (zinfo._raw_time >> 8) & 0xff
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	989 else:
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	990 # compare against the CRC otherwise
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	991 check_byte = (zinfo.CRC >> 24) & 0xff
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	992 if h[11] != check_byte:
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	993 if not self._filePassed:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	994 zef_file.close()
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44699 diff changeset	995 raise RuntimeError("Bad password for file", name)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41452 diff changeset	996
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	997 return ZipExtFile(zef_file, mode, zinfo, zd,
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66408 diff changeset	998 close_fileobj=not self._filePassed)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	999
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1000 def extract(self, member, path=None, pwd=None):
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1001 """Extract a member from the archive to the current working directory,
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1002 using its full name. Its file information is extracted as accurately
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1003 as possible. `member' may be a filename or a ZipInfo object. You can
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1004 specify a different directory using `path'.
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1005 """
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1006 if not isinstance(member, ZipInfo):
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1007 member = self.getinfo(member)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1008
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1009 if path is None:
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1010 path = os.getcwd()
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1011
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1012 return self._extract_member(member, path, pwd)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1013
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1014 def extractall(self, path=None, members=None, pwd=None):
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1015 """Extract all members from the archive to the current working
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1016 directory. `path' specifies a different directory to extract to.
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1017 `members' is optional and must be a subset of the list returned
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1018 by namelist().
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1019 """
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1020 if members is None:
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1021 members = self.namelist()
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1022
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1023 for zipinfo in members:
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1024 self.extract(zipinfo, path, pwd)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1025
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1026 def _extract_member(self, member, targetpath, pwd):
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1027 """Extract the ZipInfo object 'member' to a physical
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1028 file on the path targetpath.
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1029 """
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1030 # build the destination pathname, replacing
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1031 # forward slashes to platform specific separators.
53753 75743aaee504 Merged revisions 72295 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51001 diff changeset	1032 # Strip trailing path separator, unless it represents the root.
75743aaee504 Merged revisions 72295 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51001 diff changeset	1033 if (targetpath[-1:] in (os.path.sep, os.path.altsep)
75743aaee504 Merged revisions 72295 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51001 diff changeset	1034 and len(os.path.splitdrive(targetpath)[1]) > 1):
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1035 targetpath = targetpath[:-1]
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1036
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1037 # don't include leading "/" from file name if present
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1038 if member.filename[0] == '/':
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1039 targetpath = os.path.join(targetpath, member.filename[1:])
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1040 else:
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1041 targetpath = os.path.join(targetpath, member.filename)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1042
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1043 targetpath = os.path.normpath(targetpath)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1044
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1045 # Create all upper directories if necessary.
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1046 upperdirs = os.path.dirname(targetpath)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1047 if upperdirs and not os.path.exists(upperdirs):
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1048 os.makedirs(upperdirs)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1049
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1050 if member.filename[-1] == '/':
54313 538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 53753 diff changeset	1051 if not os.path.isdir(targetpath):
538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 53753 diff changeset	1052 os.mkdir(targetpath)
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1053 return targetpath
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1054
47278 f762a9ab69dd Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from Georg Brandl <georg@python.org> parents: 46672 diff changeset	1055 source = self.open(member, pwd=pwd)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1056 target = open(targetpath, "wb")
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1057 shutil.copyfileobj(source, target)
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1058 source.close()
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1059 target.close()
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1060
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1061 return targetpath
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44160 diff changeset	1062
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1063 def _writecheck(self, zinfo):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1064 """Check for errors before writing a file to the archive."""
23620 a1de0bab5475 SF 563203. Replaced 'has_key()' with 'in'. Raymond Hettinger <python@rcn.com> parents: 22867 diff changeset	1065 if zinfo.filename in self.NameToInfo:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1066 if self.debug: # Warning for duplicate names
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1067 print("Duplicate name:", zinfo.filename)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1068 if self.mode not in ("w", "a"):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1069 raise RuntimeError('write() requires mode "w" or "a"')
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1070 if not self.fp:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1071 raise RuntimeError(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1072 "Attempt to write ZIP archive that was already closed")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1073 if zinfo.compress_type == ZIP_DEFLATED and not zlib:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1074 raise RuntimeError(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1075 "Compression requires the (missing) zlib module")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1076 if zinfo.compress_type not in (ZIP_STORED, ZIP_DEFLATED):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1077 raise RuntimeError("That compression method is not supported")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1078 if zinfo.file_size > ZIP64_LIMIT:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1079 if not self._allowZip64:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1080 raise LargeZipFile("Filesize would require ZIP64 extensions")
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1081 if zinfo.header_offset > ZIP64_LIMIT:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1082 if not self._allowZip64:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1083 raise LargeZipFile(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1084 "Zipfile size would require ZIP64 extensions")
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1085
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1086 def write(self, filename, arcname=None, compress_type=None):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1087 """Put the bytes from filename into the archive under the name
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1088 arcname."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1089 if not self.fp:
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1090 raise RuntimeError(
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1091 "Attempt to write to ZIP archive that was already closed")
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1092
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1093 st = os.stat(filename)
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1094 isdir = stat.S_ISDIR(st.st_mode)
23625 65cf478950ff Replaced obsolete stat module constants with equivalent attributes Raymond Hettinger <python@rcn.com> parents: 23620 diff changeset	1095 mtime = time.localtime(st.st_mtime)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1096 date_time = mtime[0:6]
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1097 # Create ZipInfo instance to store file information
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1098 if arcname is None:
36609 46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 36449 diff changeset	1099 arcname = filename
46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 36449 diff changeset	1100 arcname = os.path.normpath(os.path.splitdrive(arcname)[1])
46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 36449 diff changeset	1101 while arcname[0] in (os.sep, os.altsep):
46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 36449 diff changeset	1102 arcname = arcname[1:]
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1103 if isdir:
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1104 arcname += '/'
36609 46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 36449 diff changeset	1105 zinfo = ZipInfo(arcname, date_time)
40644 1c26505c1de6 Rip out 'long' and 'L'-suffixed integer literals. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	1106 zinfo.external_attr = (st[0] & 0xFFFF) << 16 # Unix attributes
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1107 if compress_type is None:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1108 zinfo.compress_type = self.compression
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1109 else:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1110 zinfo.compress_type = compress_type
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1111
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1112 zinfo.file_size = st.st_size
19737 56c549a253a6 [ #458701 ] Patch to zipfile.py for Java Finn Bock <bckfnn@worldonline.dk> parents: 18746 diff changeset	1113 zinfo.flag_bits = 0x00
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1114 zinfo.header_offset = self.fp.tell() # Start of header bytes
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1115
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1116 self._writecheck(zinfo)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1117 self._didModify = True
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1118
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1119 if isdir:
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1120 zinfo.file_size = 0
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1121 zinfo.compress_size = 0
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1122 zinfo.CRC = 0
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1123 self.filelist.append(zinfo)
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1124 self.NameToInfo[zinfo.filename] = zinfo
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1125 self.fp.write(zinfo.FileHeader())
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1126 return
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50847 diff changeset	1127
54501 ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1128 with open(filename, "rb") as fp:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1129 # Must overwrite CRC and sizes with correct data later
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1130 zinfo.CRC = CRC = 0
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1131 zinfo.compress_size = compress_size = 0
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1132 zinfo.file_size = file_size = 0
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1133 self.fp.write(zinfo.FileHeader())
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1134 if zinfo.compress_type == ZIP_DEFLATED:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1135 cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1136 zlib.DEFLATED, -15)
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1137 else:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1138 cmpr = None
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1139 while 1:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1140 buf = fp.read(1024 * 8)
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1141 if not buf:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1142 break
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1143 file_size = file_size + len(buf)
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1144 CRC = crc32(buf, CRC) & 0xffffffff
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1145 if cmpr:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1146 buf = cmpr.compress(buf)
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1147 compress_size = compress_size + len(buf)
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1148 self.fp.write(buf)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1149 if cmpr:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1150 buf = cmpr.flush()
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1151 compress_size = compress_size + len(buf)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1152 self.fp.write(buf)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1153 zinfo.compress_size = compress_size
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1154 else:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1155 zinfo.compress_size = file_size
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1156 zinfo.CRC = CRC
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1157 zinfo.file_size = file_size
19737 56c549a253a6 [ #458701 ] Patch to zipfile.py for Java Finn Bock <bckfnn@worldonline.dk> parents: 18746 diff changeset	1158 # Seek backwards and write CRC and file sizes
19953 0f9df563b65d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 19737 diff changeset	1159 position = self.fp.tell() # Preserve current position in file
19737 56c549a253a6 [ #458701 ] Patch to zipfile.py for Java Finn Bock <bckfnn@worldonline.dk> parents: 18746 diff changeset	1160 self.fp.seek(zinfo.header_offset + 14, 0)
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	1161 self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1162 zinfo.file_size))
19737 56c549a253a6 [ #458701 ] Patch to zipfile.py for Java Finn Bock <bckfnn@worldonline.dk> parents: 18746 diff changeset	1163 self.fp.seek(position, 0)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1164 self.filelist.append(zinfo)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1165 self.NameToInfo[zinfo.filename] = zinfo
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1166
58822 faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58552 diff changeset	1167 def writestr(self, zinfo_or_arcname, data, compress_type=None):
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1168 """Write a file into the archive. The contents is 'data', which
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1169 may be either a 'str' or a 'bytes' instance; if it is a 'str',
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1170 it is encoded as UTF-8 first.
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1171 'zinfo_or_arcname' is either a ZipInfo instance or
26611 8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1172 the name of the file in the archive."""
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1173 if isinstance(data, str):
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1174 data = data.encode("utf-8")
26611 8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1175 if not isinstance(zinfo_or_arcname, ZipInfo):
8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1176 zinfo = ZipInfo(filename=zinfo_or_arcname,
44699 6f049ca55e06 Merged revisions 59952-59984 via svnmerge from Guido van Rossum <guido@python.org> parents: 44587 diff changeset	1177 date_time=time.localtime(time.time())[:6])
26611 8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1178 zinfo.compress_type = self.compression
48572 55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48499 diff changeset	1179 zinfo.external_attr = 0o600 << 16
26611 8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1180 else:
8771993c9aac Patch #651621, approved by MvL. Just van Rossum <just@letterror.com> parents: 25756 diff changeset	1181 zinfo = zinfo_or_arcname
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1182
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1183 if not self.fp:
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1184 raise RuntimeError(
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1185 "Attempt to write to ZIP archive that was already closed")
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1186
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1187 zinfo.file_size = len(data) # Uncompressed size
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1188 zinfo.header_offset = self.fp.tell() # Start of header data
58822 faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58552 diff changeset	1189 if compress_type is not None:
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58552 diff changeset	1190 zinfo.compress_type = compress_type
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58552 diff changeset	1191
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1192 self._writecheck(zinfo)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1193 self._didModify = True
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	1194 zinfo.CRC = crc32(data) & 0xffffffff # CRC-32 checksum
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1195 if zinfo.compress_type == ZIP_DEFLATED:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1196 co = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1197 zlib.DEFLATED, -15)
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1198 data = co.compress(data) + co.flush()
19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1199 zinfo.compress_size = len(data) # Compressed size
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1200 else:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1201 zinfo.compress_size = zinfo.file_size
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1202 zinfo.header_offset = self.fp.tell() # Start of header data
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1203 self.fp.write(zinfo.FileHeader())
42900 19196cce1431 Changes preparing for stricter enforcement of bytes vs. str. Guido van Rossum <guido@python.org> parents: 42314 diff changeset	1204 self.fp.write(data)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1205 self.fp.flush()
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1206 if zinfo.flag_bits & 0x08:
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1207 # Write CRC and file sizes after the file data
54860 0170c961f290 Merged revisions 73565 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 54501 diff changeset	1208 self.fp.write(struct.pack("<LLL", zinfo.CRC, zinfo.compress_size,
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1209 zinfo.file_size))
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1210 self.filelist.append(zinfo)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1211 self.NameToInfo[zinfo.filename] = zinfo
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1212
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1213 def __del__(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1214 """Call the "close()" method in case the user forgot."""
21098 82d8413636e7 SF bug 486480: zipfile __del__ is broken Tim Peters <tim.peters@gmail.com> parents: 20020 diff changeset	1215 self.close()
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1216
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1217 def close(self):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1218 """Close the file, and for mode "w" and "a" write the ending
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1219 records."""
21098 82d8413636e7 SF bug 486480: zipfile __del__ is broken Tim Peters <tim.peters@gmail.com> parents: 20020 diff changeset	1220 if self.fp is None:
82d8413636e7 SF bug 486480: zipfile __del__ is broken Tim Peters <tim.peters@gmail.com> parents: 20020 diff changeset	1221 return
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1222
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1223 if self.mode in ("w", "a") and self._didModify: # write ending records
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1224 count = 0
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1225 pos1 = self.fp.tell()
15874 4c01ee0a8073 Whitespace normalization. Top level of Lib now fixed-point for reindent.py! Tim Peters <tim.peters@gmail.com> parents: 14975 diff changeset	1226 for zinfo in self.filelist: # write central directory
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1227 count = count + 1
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1228 dt = zinfo.date_time
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1229 dosdate = (dt[0] - 1980) << 9 \| dt[1] << 5 \| dt[2]
21251 45e1177424e1 SF bug #488514: -Qnew needs work Tim Peters <tim.peters@gmail.com> parents: 21098 diff changeset	1230 dostime = dt[3] << 11 \| dt[4] << 5 \| (dt[5] // 2)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1231 extra = []
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1232 if zinfo.file_size > ZIP64_LIMIT \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1233 or zinfo.compress_size > ZIP64_LIMIT:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1234 extra.append(zinfo.file_size)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1235 extra.append(zinfo.compress_size)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1236 file_size = 0xffffffff
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1237 compress_size = 0xffffffff
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1238 else:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1239 file_size = zinfo.file_size
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1240 compress_size = zinfo.compress_size
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1241
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1242 if zinfo.header_offset > ZIP64_LIMIT:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1243 extra.append(zinfo.header_offset)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1244 header_offset = 0xffffffff
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1245 else:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1246 header_offset = zinfo.header_offset
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1247
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1248 extra_data = zinfo.extra
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1249 if extra:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1250 # Append a ZIP64 field to the extra's
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1251 extra_data = struct.pack(
45931 1657f0acca78 Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44810 diff changeset	1252 '<HH' + 'Q'*len(extra),
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1253 1, 8len(extra), extra) + extra_data
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1254
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1255 extract_version = max(45, zinfo.extract_version)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1256 create_version = max(45, zinfo.create_version)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1257 else:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1258 extract_version = zinfo.extract_version
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1259 create_version = zinfo.create_version
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1260
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1261 try:
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1262 filename, flag_bits = zinfo._encodeFilenameFlags()
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1263 centdir = struct.pack(structCentralDir,
56223 781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1264 stringCentralDir, create_version,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1265 zinfo.create_system, extract_version, zinfo.reserved,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1266 flag_bits, zinfo.compress_type, dostime, dosdate,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1267 zinfo.CRC, compress_size, file_size,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1268 len(filename), len(extra_data), len(zinfo.comment),
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1269 0, zinfo.internal_attr, zinfo.external_attr,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1270 header_offset)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1271 except DeprecationWarning:
56223 781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1272 print((structCentralDir, stringCentralDir, create_version,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1273 zinfo.create_system, extract_version, zinfo.reserved,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1274 zinfo.flag_bits, zinfo.compress_type, dostime, dosdate,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1275 zinfo.CRC, compress_size, file_size,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1276 len(zinfo.filename), len(extra_data), len(zinfo.comment),
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1277 0, zinfo.internal_attr, zinfo.external_attr,
781ef95cb781 Merged revisions 75064 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 56002 diff changeset	1278 header_offset), file=sys.stderr)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1279 raise
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1280 self.fp.write(centdir)
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 45941 diff changeset	1281 self.fp.write(filename)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1282 self.fp.write(extra_data)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1283 self.fp.write(zinfo.comment)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1284
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1285 pos2 = self.fp.tell()
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1286 # Write end-of-zip-archive record
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1287 centDirCount = count
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1288 centDirSize = pos2 - pos1
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1289 centDirOffset = pos1
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1290 if (centDirCount >= ZIP_FILECOUNT_LIMIT or
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1291 centDirOffset > ZIP64_LIMIT or
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1292 centDirSize > ZIP64_LIMIT):
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1293 # Need to write the ZIP64 end-of-archive records
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1294 zip64endrec = struct.pack(
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	1295 structEndArchive64, stringEndArchive64,
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1296 44, 45, 45, 0, 0, centDirCount, centDirCount,
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1297 centDirSize, centDirOffset)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1298 self.fp.write(zip64endrec)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1299
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1300 zip64locrec = struct.pack(
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	1301 structEndArchive64Locator,
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	1302 stringEndArchive64Locator, 0, pos2, 1)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1303 self.fp.write(zip64locrec)
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1304 centDirCount = min(centDirCount, 0xFFFF)
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1305 centDirSize = min(centDirSize, 0xFFFFFFFF)
1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1306 centDirOffset = min(centDirOffset, 0xFFFFFFFF)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1307
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48423 diff changeset	1308 endrec = struct.pack(structEndArchive, stringEndArchive,
50825 1aad7d2e8945 Merged revisions 68661 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 50301 diff changeset	1309 0, 0, centDirCount, centDirCount,
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1310 centDirSize, centDirOffset, len(self._comment))
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1311 self.fp.write(endrec)
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1312 self.fp.write(self._comment)
17517 1e23d91c0a82 Mark Favas points out that there's an 'self.fp.flush()' call in the Guido van Rossum <guido@python.org> parents: 17377 diff changeset	1313 self.fp.flush()
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	1314
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	1315 if not self._filePassed:
f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16889 diff changeset	1316 self.fp.close()
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1317 self.fp = None
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1318
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1319
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1320 class PyZipFile(ZipFile):
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1321 """Class to create ZIP archives with Python library files and packages."""
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1322
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1323 def __init__(self, file, mode="r", compression=ZIP_STORED,
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1324 allowZip64=False, optimize=-1):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1325 ZipFile.__init__(self, file, mode=mode, compression=compression,
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1326 allowZip64=allowZip64)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1327 self._optimize = optimize
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1328
56002 fa91270b6087 Merged revisions 74821,74828-74831,74833,74835 via svnmerge from Georg Brandl <georg@python.org> parents: 54860 diff changeset	1329 def writepy(self, pathname, basename=""):
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1330 """Add all files from "pathname" to the ZIP archive.
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1331
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1332 If pathname is a package directory, search the directory and
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1333 all package subdirectories recursively for all *.py and enter
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1334 the modules into the archive. If pathname is a plain
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1335 directory, listdir *.py and enter all modules. Else, pathname
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1336 must be a Python *.py file and the module will be put into the
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1337 archive. Added modules are always module.pyo or module.pyc.
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1338 This method will compile the module.py into module.pyc if
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1339 necessary.
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1340 """
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1341 dir, name = os.path.split(pathname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1342 if os.path.isdir(pathname):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1343 initname = os.path.join(pathname, "__init__.py")
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1344 if os.path.isfile(initname):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1345 # This is a package directory, add it
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1346 if basename:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1347 basename = "%s/%s" % (basename, name)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1348 else:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1349 basename = name
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1350 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1351 print("Adding package in", pathname, "as", basename)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1352 fname, arcname = self._get_codename(initname[0:-3], basename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1353 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1354 print("Adding", arcname)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1355 self.write(fname, arcname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1356 dirlist = os.listdir(pathname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1357 dirlist.remove("__init__.py")
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1358 # Add all *.py files and package subdirectories
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1359 for filename in dirlist:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1360 path = os.path.join(pathname, filename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1361 root, ext = os.path.splitext(filename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1362 if os.path.isdir(path):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1363 if os.path.isfile(os.path.join(path, "__init__.py")):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1364 # This is a package directory, add it
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1365 self.writepy(path, basename) # Recursive call
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1366 elif ext == ".py":
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1367 fname, arcname = self._get_codename(path[0:-3],
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1368 basename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1369 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1370 print("Adding", arcname)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1371 self.write(fname, arcname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1372 else:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1373 # This is NOT a package directory, add its files at top level
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1374 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1375 print("Adding files from directory", pathname)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1376 for filename in os.listdir(pathname):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1377 path = os.path.join(pathname, filename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1378 root, ext = os.path.splitext(filename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1379 if ext == ".py":
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1380 fname, arcname = self._get_codename(path[0:-3],
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1381 basename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1382 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1383 print("Adding", arcname)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1384 self.write(fname, arcname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1385 else:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1386 if pathname[-3:] != ".py":
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1387 raise RuntimeError(
907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 43005 diff changeset	1388 'Files added with writepy() must end with ".py"')
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1389 fname, arcname = self._get_codename(pathname[0:-3], basename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1390 if self.debug:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1391 print("Adding file", arcname)
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1392 self.write(fname, arcname)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1393
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1394 def _get_codename(self, pathname, basename):
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1395 """Return (filename, archivename) for the path.
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1396
14975 27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1397 Given a module name path, return the correct file path and
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1398 archive name, compiling if necessary. For example, given
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1399 /python/lib/string, return (/python/lib/string.pyc, string).
27eab8032766 Delay import of py_compile until needed, since is is only used by the Fred Drake <fdrake@acm.org> parents: 14933 diff changeset	1400 """
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1401 def _compile(file, optimize=-1):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1402 import py_compile
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1403 if self.debug:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1404 print("Compiling", file)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1405 try:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1406 py_compile.compile(file, doraise=True, optimize=optimize)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1407 except py_compile.PyCompileError as error:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1408 print(err.msg)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1409 return False
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1410 return True
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1411
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1412 file_py = pathname + ".py"
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1413 file_pyc = pathname + ".pyc"
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1414 file_pyo = pathname + ".pyo"
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	1415 pycache_pyc = imp.cache_from_source(file_py, True)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	1416 pycache_pyo = imp.cache_from_source(file_py, False)
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1417 if self._optimize == -1:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1418 # legacy mode: use whatever file is present
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1419 if (os.path.isfile(file_pyo) and
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1420 os.stat(file_pyo).st_mtime >= os.stat(file_py).st_mtime):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1421 # Use .pyo file.
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1422 arcname = fname = file_pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1423 elif (os.path.isfile(file_pyc) and
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1424 os.stat(file_pyc).st_mtime >= os.stat(file_py).st_mtime):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1425 # Use .pyc file.
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1426 arcname = fname = file_pyc
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1427 elif (os.path.isfile(pycache_pyc) and
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1428 os.stat(pycache_pyc).st_mtime >= os.stat(file_py).st_mtime):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1429 # Use the __pycache__/*.pyc file, but write it to the legacy pyc
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1430 # file name in the archive.
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1431 fname = pycache_pyc
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1432 arcname = file_pyc
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1433 elif (os.path.isfile(pycache_pyo) and
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1434 os.stat(pycache_pyo).st_mtime >= os.stat(file_py).st_mtime):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1435 # Use the __pycache__/*.pyo file, but write it to the legacy pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1436 # file name in the archive.
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1437 fname = pycache_pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1438 arcname = file_pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1439 else:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1440 # Compile py into PEP 3147 pyc file.
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1441 if _compile(file_py):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1442 fname = (pycache_pyc if __debug__ else pycache_pyo)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1443 arcname = (file_pyc if __debug__ else file_pyo)
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1444 else:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1445 fname = arcname = file_py
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1446 else:
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1447 # new mode: use given optimization level
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1448 if self._optimize == 0:
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1449 fname = pycache_pyc
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1450 arcname = file_pyc
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	1451 else:
66685 713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1452 fname = pycache_pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1453 arcname = file_pyo
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1454 if not (os.path.isfile(fname) and
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1455 os.stat(fname).st_mtime >= os.stat(file_py).st_mtime):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1456 if not _compile(file_py, optimize=self._optimize):
713c6b6ca5ce Add an "optimize" parameter to compile() to control the optimization level, and provide an interface to it in py_compile, compileall and PyZipFile. Georg Brandl <georg@python.org> parents: 66409 diff changeset	1457 fname = arcname = file_py
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	1458 archivename = os.path.split(arcname)[1]
12197 7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1459 if basename:
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1460 archivename = "%s/%s" % (basename, archivename)
7f18f979a93a Zip file handling module, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	1461 return (fname, archivename)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1462
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1463
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1464 def main(args = None):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1465 import textwrap
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1466 USAGE=textwrap.dedent("""\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1467 Usage:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1468 zipfile.py -l zipfile.zip # Show listing of a zipfile
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1469 zipfile.py -t zipfile.zip # Test if a zipfile is valid
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1470 zipfile.py -e zipfile.zip target # Extract zipfile into target dir
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1471 zipfile.py -c zipfile.zip src ... # Create zipfile from sources
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1472 """)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1473 if args is None:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1474 args = sys.argv[1:]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1475
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1476 if not args or args[0] not in ('-l', '-c', '-e', '-t'):
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1477 print(USAGE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1478 sys.exit(1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1479
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1480 if args[0] == '-l':
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1481 if len(args) != 2:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1482 print(USAGE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1483 sys.exit(1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1484 zf = ZipFile(args[1], 'r')
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1485 zf.printdir()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1486 zf.close()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1487
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1488 elif args[0] == '-t':
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1489 if len(args) != 2:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1490 print(USAGE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1491 sys.exit(1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1492 zf = ZipFile(args[1], 'r')
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1493 badfile = zf.testzip()
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1494 if badfile:
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1495 print("The following enclosed file is corrupted: {!r}".format(badfile))
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1496 print("Done testing")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1497
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1498 elif args[0] == '-e':
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1499 if len(args) != 3:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1500 print(USAGE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1501 sys.exit(1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1502
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1503 zf = ZipFile(args[1], 'r')
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1504 out = args[2]
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1505 for path in zf.namelist():
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1506 if path.startswith('./'):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1507 tgt = os.path.join(out, path[2:])
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1508 else:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1509 tgt = os.path.join(out, path)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1510
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1511 tgtdir = os.path.dirname(tgt)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1512 if not os.path.exists(tgtdir):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1513 os.makedirs(tgtdir)
54501 ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1514 with open(tgt, 'wb') as fp:
ced380b40004 Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54313 diff changeset	1515 fp.write(zf.read(path))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1516 zf.close()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1517
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1518 elif args[0] == '-c':
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1519 if len(args) < 3:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1520 print(USAGE)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1521 sys.exit(1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1522
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1523 def addToZip(zf, path, zippath):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1524 if os.path.isfile(path):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1525 zf.write(path, zippath, ZIP_DEFLATED)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1526 elif os.path.isdir(path):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1527 for nm in os.listdir(path):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1528 addToZip(zf,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1529 os.path.join(path, nm), os.path.join(zippath, nm))
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1530 # else: ignore
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1531
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1532 zf = ZipFile(args[1], 'w', allowZip64=True)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1533 for src in args[2:]:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1534 addToZip(zf, src, os.path.basename(src))
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1535
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1536 zf.close()
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1537
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1538 if __name__ == "__main__":
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36609 diff changeset	1539 main()

Mercurial > cpython-lru_cache-weakref

annotate Lib/zipfile.py @ 78069:a8aa77458e12 3.2