traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace normalization.

This commit is contained in:
Tim Peters 2006-06-15 18:06:29 +00:00
parent 84b0f581ef
commit a608bb228c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_zipfile.py
View File

@ -46,7 +46,7 @@ class TestsWithSourceFile(unittest.TestCase):
zipfp.printdir() zipfp.printdir()
finally: finally:
sys.stdout = stdout sys.stdout = stdout
directory = fp.getvalue() directory = fp.getvalue()
lines = directory.splitlines() lines = directory.splitlines()
self.assertEquals(len(lines), 4) # Number of files + header self.assertEquals(len(lines), 4) # Number of files + header
@ -133,13 +133,13 @@ class TestZip64InSmallFiles(unittest.TestCase):
def largeFileExceptionTest(self, f, compression): def largeFileExceptionTest(self, f, compression):
zipfp = zipfile.ZipFile(f, "w", compression) zipfp = zipfile.ZipFile(f, "w", compression)
self.assertRaises(zipfile.LargeZipFile, self.assertRaises(zipfile.LargeZipFile,
zipfp.write, TESTFN, "another"+os.extsep+"name") zipfp.write, TESTFN, "another"+os.extsep+"name")
zipfp.close() zipfp.close()
def largeFileExceptionTest2(self, f, compression): def largeFileExceptionTest2(self, f, compression):
zipfp = zipfile.ZipFile(f, "w", compression) zipfp = zipfile.ZipFile(f, "w", compression)
self.assertRaises(zipfile.LargeZipFile, self.assertRaises(zipfile.LargeZipFile,
zipfp.writestr, "another"+os.extsep+"name", self.data) zipfp.writestr, "another"+os.extsep+"name", self.data)
zipfp.close() zipfp.close()
@ -171,7 +171,7 @@ class TestZip64InSmallFiles(unittest.TestCase):
zipfp.printdir() zipfp.printdir()
finally: finally:
sys.stdout = stdout sys.stdout = stdout
directory = fp.getvalue() directory = fp.getvalue()
lines = directory.splitlines() lines = directory.splitlines()
self.assertEquals(len(lines), 4) # Number of files + header self.assertEquals(len(lines), 4) # Number of files + header

22
Lib/zipfile.py
View File

@ -17,7 +17,7 @@ class BadZipfile(Exception):
class LargeZipFile(Exception): class LargeZipFile(Exception):
""" """
Raised when writing a zipfile, the zipfile requires ZIP64 extensions Raised when writing a zipfile, the zipfile requires ZIP64 extensions
and those extensions are disabled. and those extensions are disabled.
""" """
@ -99,20 +99,20 @@ def _EndRecData64(fpin, offset, endrec):
fpin.seek(offset - locatorSize, 2) fpin.seek(offset - locatorSize, 2)
data = fpin.read(locatorSize) data = fpin.read(locatorSize)
sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data) sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data)
if sig != stringEndArchive64Locator: if sig != stringEndArchive64Locator:
return endrec return endrec
if diskno != 0 or disks != 1: if diskno != 0 or disks != 1:
raise BadZipfile("zipfiles that span multiple disks are not supported") raise BadZipfile("zipfiles that span multiple disks are not supported")
# Assume no 'zip64 extensible data' # Assume no 'zip64 extensible data'
endArchiveSize = struct.calcsize(structEndArchive64) endArchiveSize = struct.calcsize(structEndArchive64)
fpin.seek(offset - locatorSize - endArchiveSize, 2) fpin.seek(offset - locatorSize - endArchiveSize, 2)
data = fpin.read(endArchiveSize) data = fpin.read(endArchiveSize)
sig, sz, create_version, read_version, disk_num, disk_dir, \ sig, sz, create_version, read_version, disk_num, disk_dir, \
dircount, dircount2, dirsize, diroffset = \ dircount, dircount2, dirsize, diroffset = \
struct.unpack(structEndArchive64, data) struct.unpack(structEndArchive64, data)
if sig != stringEndArchive64: if sig != stringEndArchive64:
return endrec return endrec
# Update the original endrec using data from the ZIP64 record # Update the original endrec using data from the ZIP64 record
@ -294,7 +294,7 @@ class ZipInfo (object):
idx+=1 idx+=1
extra = extra[ln+4:] extra = extra[ln+4:]
class ZipFile: class ZipFile:
""" Class with methods to open, read, write, close, list zip files. """ Class with methods to open, read, write, close, list zip files.
@ -642,7 +642,7 @@ class ZipFile:
records.""" records."""
if self.fp is None: if self.fp is None:
return return
if self.mode in ("w", "a") and self._didModify: # write ending records if self.mode in ("w", "a") and self._didModify: # write ending records
count = 0 count = 0
pos1 = self.fp.tell() pos1 = self.fp.tell()
@ -674,7 +674,7 @@ class ZipFile:
extra_data = struct.pack( extra_data = struct.pack(
'<hh' + 'q'*len(extra), '<hh' + 'q'*len(extra),
1, 8*len(extra), *extra) + extra_data 1, 8*len(extra), *extra) + extra_data
extract_version = max(45, zinfo.extract_version) extract_version = max(45, zinfo.extract_version)
create_version = max(45, zinfo.create_version) create_version = max(45, zinfo.create_version)
else: else:
@ -704,7 +704,7 @@ class ZipFile:
self.fp.write(zip64endrec) self.fp.write(zip64endrec)
zip64locrec = struct.pack( zip64locrec = struct.pack(
structEndArchive64Locator, structEndArchive64Locator,
stringEndArchive64Locator, 0, pos2, 1) stringEndArchive64Locator, 0, pos2, 1)
self.fp.write(zip64locrec) self.fp.write(zip64locrec)
@ -862,7 +862,7 @@ def main(args = None):
zf = ZipFile(args[1], 'r') zf = ZipFile(args[1], 'r')
out = args[2] out = args[2]
for path in zf.namelist(): for path in zf.namelist():
if path.startswith('./'): if path.startswith('./'):
tgt = os.path.join(out, path[2:]) tgt = os.path.join(out, path[2:])
else: else:
tgt = os.path.join(out, path) tgt = os.path.join(out, path)
@ -885,9 +885,9 @@ def main(args = None):
zf.write(path, zippath, ZIP_DEFLATED) zf.write(path, zippath, ZIP_DEFLATED)
elif os.path.isdir(path): elif os.path.isdir(path):
for nm in os.listdir(path): for nm in os.listdir(path):
addToZip(zf, addToZip(zf,
os.path.join(path, nm), os.path.join(zippath, nm)) os.path.join(path, nm), os.path.join(zippath, nm))
# else: ignore # else: ignore
zf = ZipFile(args[1], 'w', allowZip64=True) zf = ZipFile(args[1], 'w', allowZip64=True)
for src in args[2:]: for src in args[2:]: