cpython-lru_cache-weakref: Lib/test/test

annotate Lib/test/test_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	e13c9f99fbae
children	b193a5dc7a58 b299b4279e13

rev	line source
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	1 # We can test part of the module without zlib.
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	2 try:
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	3 import zlib
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	4 except ImportError:
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	5 zlib = None
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	6
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	7 import io
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	8 import os
67245 33543b4e0e5d #10801: In zipfile, support different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky. Georg Brandl <georg@python.org> parents: 67076 diff changeset	9 import sys
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	10 import imp
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	11 import time
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	12 import shutil
1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	13 import struct
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	14 import zipfile
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	15 import unittest
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	16
33204 c18aca7e81cb Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 33191 diff changeset	17
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	18 from tempfile import TemporaryFile
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	19 from random import randint, random
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	20 from unittest import skipUnless
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	21
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	22 from test.support import TESTFN, run_unittest, findfile, unlink
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	23
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	24 TESTFN2 = TESTFN + "2"
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	25 TESTFNDIR = TESTFN + "d"
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	26 FIXEDTEST_SIZE = 1000
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	27 DATAFILES_DIR = 'zipfile_datafiles'
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	28
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	29 SMALL_TEST_DATA = [('_ziptest1', '1q2w3e4r5t'),
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	30 ('ziptest2dir/_ziptest2', 'qawsedrftg'),
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	31 ('/ziptest2dir/ziptest3dir/_ziptest3', 'azsxdcfvgb'),
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	32 ('ziptest2dir/ziptest3dir/ziptest4dir/_ziptest3', '6y7u8i9o0p')]
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	33
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	34
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	35 class TestsWithSourceFile(unittest.TestCase):
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	36 def setUp(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	37 self.line_gen = (bytes("Zipfile test line %d. random float: %f" %
42907 0170418dadea Changes in anticipation of stricter str vs. bytes enforcement. Guido van Rossum <guido@python.org> parents: 42838 diff changeset	38 (i, random()), "ascii")
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	39 for i in range(FIXEDTEST_SIZE))
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	40 self.data = b'\n'.join(self.line_gen) + b'\n'
17224 f9395f7627c4 Itamar Shtull-Trauring <itamar@maxnm.com>: Fred Drake <fdrake@acm.org> parents: 16827 diff changeset	41
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	42 # Make a source file with some lines
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	43 with open(TESTFN, "wb") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	44 fp.write(self.data)
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	45
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	46 def make_test_archive(self, f, compression):
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	47 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	48 with zipfile.ZipFile(f, "w", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	49 zipfp.write(TESTFN, "another.name")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	50 zipfp.write(TESTFN, TESTFN)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	51 zipfp.writestr("strfile", self.data)
17245 0377f927cafa Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 17224 diff changeset	52
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	53 def zip_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	54 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	55
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	56 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	57 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	58 self.assertEqual(zipfp.read(TESTFN), self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	59 self.assertEqual(zipfp.read("another.name"), self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	60 self.assertEqual(zipfp.read("strfile"), self.data)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	61
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	62 # Print the ZIP directory
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	63 fp = io.StringIO()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	64 zipfp.printdir(file=fp)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	65 directory = fp.getvalue()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	66 lines = directory.splitlines()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	67 self.assertEqual(len(lines), 4) # Number of files + header
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	68
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	69 self.assertIn('File Name', lines[0])
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	70 self.assertIn('Modified', lines[0])
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	71 self.assertIn('Size', lines[0])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	72
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	73 fn, date, time_, size = lines[1].split()
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	74 self.assertEqual(fn, 'another.name')
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	75 self.assertTrue(time.strptime(date, '%Y-%m-%d'))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	76 self.assertTrue(time.strptime(time_, '%H:%M:%S'))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	77 self.assertEqual(size, str(len(self.data)))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	78
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	79 # Check the namelist
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	80 names = zipfp.namelist()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	81 self.assertEqual(len(names), 3)
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	82 self.assertIn(TESTFN, names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	83 self.assertIn("another.name", names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	84 self.assertIn("strfile", names)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	85
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	86 # Check infolist
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	87 infos = zipfp.infolist()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	88 names = [i.filename for i in infos]
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	89 self.assertEqual(len(names), 3)
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	90 self.assertIn(TESTFN, names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	91 self.assertIn("another.name", names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	92 self.assertIn("strfile", names)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	93 for i in infos:
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	94 self.assertEqual(i.file_size, len(self.data))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	95
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	96 # check getinfo
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	97 for nm in (TESTFN, "another.name", "strfile"):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	98 info = zipfp.getinfo(nm)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	99 self.assertEqual(info.filename, nm)
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	100 self.assertEqual(info.file_size, len(self.data))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	101
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	102 # Check that testzip doesn't raise an exception
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	103 zipfp.testzip()
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	104 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	105 f.close()
12323 1a207c68e8b4 Test for zipfile.py, by Jim Ahlstrom. Guido van Rossum <guido@python.org> parents: diff changeset	106
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	107 def test_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	108 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	109 self.zip_test(f, zipfile.ZIP_STORED)
16827 ce47498a3158 Added regression test for SF tracker bug #403871: AttributeError in Fred Drake <fdrake@acm.org> parents: 15305 diff changeset	110
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	111 def zip_open_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	112 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	113
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	114 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	115 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	116 zipdata1 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	117 with zipfp.open(TESTFN) as zipopen1:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	118 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	119 read_data = zipopen1.read(256)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	120 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	121 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	122 zipdata1.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	123
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	124 zipdata2 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	125 with zipfp.open("another.name") as zipopen2:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	126 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	127 read_data = zipopen2.read(256)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	128 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	129 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	130 zipdata2.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	131
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	132 self.assertEqual(b''.join(zipdata1), self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	133 self.assertEqual(b''.join(zipdata2), self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	134 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	135 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	136
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	137 def test_open_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	138 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	139 self.zip_open_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	140
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	141 def test_open_via_zip_info(self):
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: 47201 diff changeset	142 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	143 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	144 zipfp.writestr("name", "foo")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	145 zipfp.writestr("name", "bar")
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	146
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	147 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	148 infos = zipfp.infolist()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	149 data = b""
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	150 for info in infos:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	151 with zipfp.open(info) as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	152 data += zipopen.read()
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	153 self.assertTrue(data == b"foobar" or data == b"barfoo")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	154 data = b""
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	155 for info in infos:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	156 data += zipfp.read(info)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	157 self.assertTrue(data == b"foobar" or data == b"barfoo")
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: 47201 diff changeset	158
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	159 def zip_random_open_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	160 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	161
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	162 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	163 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	164 zipdata1 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	165 with zipfp.open(TESTFN) as zipopen1:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	166 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	167 read_data = zipopen1.read(randint(1, 1024))
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	168 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	169 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	170 zipdata1.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	171
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	172 self.assertEqual(b''.join(zipdata1), self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	173 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	174 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	175
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	176 def test_random_open_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	177 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	178 self.zip_random_open_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	179
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	180 def test_univeral_readaheads(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	181 f = io.BytesIO()
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	182
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	183 data = b'a\r\n' * 16 * 1024
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	184 zipfp = zipfile.ZipFile(f, 'w', zipfile.ZIP_STORED)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	185 zipfp.writestr(TESTFN, data)
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: 47201 diff changeset	186 zipfp.close()
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: 47201 diff changeset	187
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	188 data2 = b''
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	189 zipfp = zipfile.ZipFile(f, 'r')
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	190 with zipfp.open(TESTFN, 'rU') as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	191 for line in zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	192 data2 += line
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: 47201 diff changeset	193 zipfp.close()
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: 47201 diff changeset	194
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	195 self.assertEqual(data, data2.replace(b'\n', b'\r\n'))
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	196
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	197 def zip_readline_read_test(self, f, compression):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	198 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	199
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	200 # Read the ZIP archive
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	201 zipfp = zipfile.ZipFile(f, "r")
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	202 with zipfp.open(TESTFN) as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	203 data = b''
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	204 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	205 read = zipopen.readline()
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	206 if not read:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	207 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	208 data += read
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	209
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	210 read = zipopen.read(100)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	211 if not read:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	212 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	213 data += read
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	214
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	215 self.assertEqual(data, self.data)
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	216 zipfp.close()
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	217 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	218 f.close()
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	219
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	220 def zip_readline_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	221 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	222
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	223 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	224 with zipfile.ZipFile(f, "r") as zipfp:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	225 with zipfp.open(TESTFN) as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	226 for line in self.line_gen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	227 linedata = zipopen.readline()
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	228 self.assertEqual(linedata, line + '\n')
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	229 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	230 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	231
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	232 def zip_readlines_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	233 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	234
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	235 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	236 with zipfile.ZipFile(f, "r") as zipfp:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	237 with zipfp.open(TESTFN) as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	238 ziplines = zipopen.readlines()
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	239 for line, zipline in zip(self.line_gen, ziplines):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	240 self.assertEqual(zipline, line + '\n')
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	241 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	242 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	243
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	244 def zip_iterlines_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	245 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	246
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	247 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	248 with zipfile.ZipFile(f, "r") as zipfp:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	249 with zipfp.open(TESTFN) as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	250 for line, zipline in zip(self.line_gen, zipopen):
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	251 self.assertEqual(zipline, line + '\n')
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	252 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	253 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	254
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	255 def test_readline_read_stored(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	256 # Issue #7610: calls to readline() interleaved with calls to read().
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	257 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	258 self.zip_readline_read_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	259
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	260 def test_readline_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	261 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	262 self.zip_readline_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	263
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	264 def test_readlines_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	265 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	266 self.zip_readlines_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	267
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	268 def test_iterlines_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	269 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	270 self.zip_iterlines_test(f, zipfile.ZIP_STORED)
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	271
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	272 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	273 def test_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	274 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	275 self.zip_test(f, zipfile.ZIP_DEFLATED)
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	276
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	277
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	278 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	279 def test_open_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	280 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	281 self.zip_open_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	282
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	283 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	284 def test_random_open_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	285 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	286 self.zip_random_open_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	287
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	288 @skipUnless(zlib, "requires zlib")
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	289 def test_readline_read_deflated(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	290 # Issue #7610: calls to readline() interleaved with calls to read().
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	291 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	292 self.zip_readline_read_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	293
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	294 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	295 def test_readline_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	296 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	297 self.zip_readline_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	298
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	299 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	300 def test_readlines_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	301 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	302 self.zip_readlines_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	303
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	304 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	305 def test_iterlines_deflated(self):
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	306 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	307 self.zip_iterlines_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	308
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	309 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	310 def test_low_compression(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	311 """Check for cases where compressed data is larger than original."""
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	312 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	313 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_DEFLATED) as zipfp:
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	314 zipfp.writestr("strfile", '12')
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	315
55156 d9b19b37f81a Merged revisions 73841 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55603 diff changeset	316 # Get an open object for strfile
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	317 with zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_DEFLATED) as zipfp:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	318 with zipfp.open("strfile") as openobj:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	319 self.assertEqual(openobj.read(1), b'1')
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	320 self.assertEqual(openobj.read(1), b'2')
36609 46ec948cbde8 Bug #1413790: zipfile now sanitizes absolute archive names that are Georg Brandl <georg@python.org> parents: 33204 diff changeset	321
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	322 def test_absolute_arcnames(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	323 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	324 zipfp.write(TESTFN, "/absolute")
36630 eb0977932e2d Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 36609 diff changeset	325
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	326 with zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	327 self.assertEqual(zipfp.namelist(), ["absolute"])
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	328
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	329 def test_append_to_zip_file(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	330 """Test appending to an existing zipfile."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	331 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	332 zipfp.write(TESTFN, TESTFN)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	333
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	334 with zipfile.ZipFile(TESTFN2, "a", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	335 zipfp.writestr("strfile", self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	336 self.assertEqual(zipfp.namelist(), [TESTFN, "strfile"])
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	337
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	338 def test_append_to_non_zip_file(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	339 """Test appending to an existing file that is not a zipfile."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	340 # NOTE: this test fails if len(d) < 22 because of the first
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	341 # line "fpin.seek(-22, 2)" in _EndRecData
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	342 data = b'I am not a ZipFile!'*10
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	343 with open(TESTFN2, 'wb') as f:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	344 f.write(data)
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	345
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	346 with zipfile.ZipFile(TESTFN2, "a", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	347 zipfp.write(TESTFN, TESTFN)
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	348
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	349 with open(TESTFN2, 'rb') as f:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	350 f.seek(len(data))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	351 with zipfile.ZipFile(f, "r") as zipfp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	352 self.assertEqual(zipfp.namelist(), [TESTFN])
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	353
70746 7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	354 def test_ignores_newline_at_end(self):
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	355 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	356 zipfp.write(TESTFN, TESTFN)
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	357 with open(TESTFN2, 'a') as f:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	358 f.write("\r\n\00\00\00")
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	359 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	360 self.assertIsInstance(zipfp, zipfile.ZipFile)
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	361
70746 7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	362 def test_ignores_stuff_appended_past_comments(self):
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	363 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	364 zipfp.comment = b"this is a comment"
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	365 zipfp.write(TESTFN, TESTFN)
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	366 with open(TESTFN2, 'a') as f:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	367 f.write("abcdef\r\n")
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	368 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	369 self.assertIsInstance(zipfp, zipfile.ZipFile)
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	370 self.assertEqual(zipfp.comment, b"this is a comment")
7530b141c20f #10694: zipfile now ignores garbage at the end of a zipfile. R David Murray <rdmurray@bitdance.com> parents: 70293 diff changeset	371
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	372 def test_write_default_name(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	373 """Check that calling ZipFile.write without arcname specified
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	374 produces the expected result."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	375 with zipfile.ZipFile(TESTFN2, "w") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	376 zipfp.write(TESTFN)
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	377 with open(TESTFN, "rb") as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	378 self.assertEqual(zipfp.read(TESTFN), f.read())
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	379
55921 5111d3299741 Merged revisions 74754 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55486 diff changeset	380 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	381 def test_per_file_compression(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	382 """Check that files within a Zip archive can have different
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	383 compression options."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	384 with zipfile.ZipFile(TESTFN2, "w") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	385 zipfp.write(TESTFN, 'storeme', zipfile.ZIP_STORED)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	386 zipfp.write(TESTFN, 'deflateme', zipfile.ZIP_DEFLATED)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	387 sinfo = zipfp.getinfo('storeme')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	388 dinfo = zipfp.getinfo('deflateme')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	389 self.assertEqual(sinfo.compress_type, zipfile.ZIP_STORED)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	390 self.assertEqual(dinfo.compress_type, zipfile.ZIP_DEFLATED)
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	391
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	392 def test_write_to_readonly(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	393 """Check that trying to call write() on a readonly ZipFile object
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	394 raises a RuntimeError."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	395 with zipfile.ZipFile(TESTFN2, mode="w") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	396 zipfp.writestr("somefile.txt", "bogus")
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	397
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	398 with zipfile.ZipFile(TESTFN2, mode="r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	399 self.assertRaises(RuntimeError, zipfp.write, TESTFN)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	400
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	401 def test_extract(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	402 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	403 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	404 zipfp.writestr(fpath, fdata)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	405
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	406 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	407 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	408 writtenfile = zipfp.extract(fpath)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	409
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	410 # make sure it was written to the right place
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	411 if os.path.isabs(fpath):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	412 correctfile = os.path.join(os.getcwd(), fpath[1:])
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	413 else:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	414 correctfile = os.path.join(os.getcwd(), fpath)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	415 correctfile = os.path.normpath(correctfile)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	416
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	417 self.assertEqual(writtenfile, correctfile)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	418
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	419 # make sure correct data is in correct file
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	420 with open(writtenfile, "rb") as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	421 self.assertEqual(fdata.encode(), f.read())
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	422
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	423 os.remove(writtenfile)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	424
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	425 # remove the test file subdirectories
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	426 shutil.rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	427
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	428 def test_extract_all(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	429 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	430 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	431 zipfp.writestr(fpath, fdata)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	432
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	433 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	434 zipfp.extractall()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	435 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	436 if os.path.isabs(fpath):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	437 outfile = os.path.join(os.getcwd(), fpath[1:])
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	438 else:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	439 outfile = os.path.join(os.getcwd(), fpath)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	440
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	441 with open(outfile, "rb") as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	442 self.assertEqual(fdata.encode(), f.read())
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	443
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	444 os.remove(outfile)
44587 fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	445
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	446 # remove the test file subdirectories
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	447 shutil.rmtree(os.path.join(os.getcwd(), 'ziptest2dir'))
fb5a6330f71b Merged revisions 59822-59841 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43022 diff changeset	448
58822 faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	449 def test_writestr_compression(self):
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	450 zipfp = zipfile.ZipFile(TESTFN2, "w")
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	451 zipfp.writestr("a.txt", "hello world", compress_type=zipfile.ZIP_STORED)
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	452 if zlib:
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	453 zipfp.writestr("b.txt", "hello world", compress_type=zipfile.ZIP_DEFLATED)
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	454
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	455 info = zipfp.getinfo('a.txt')
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	456 self.assertEqual(info.compress_type, zipfile.ZIP_STORED)
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	457
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	458 if zlib:
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	459 info = zipfp.getinfo('b.txt')
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	460 self.assertEqual(info.compress_type, zipfile.ZIP_DEFLATED)
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	461
faca97c5f038 Merged revisions 78097 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 58542 diff changeset	462
48572 55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	463 def zip_test_writestr_permissions(self, f, compression):
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	464 # Make sure that writestr creates files with mode 0600,
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	465 # when it is passed a name rather than a ZipInfo instance.
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	466
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	467 self.make_test_archive(f, compression)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	468 with zipfile.ZipFile(f, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	469 zinfo = zipfp.getinfo('strfile')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	470 self.assertEqual(zinfo.external_attr, 0o600 << 16)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	471 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	472 f.close()
48572 55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	473
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	474 def test_writestr_permissions(self):
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	475 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	476 self.zip_test_writestr_permissions(f, zipfile.ZIP_STORED)
55640151e0fc Merged revisions 65235 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48423 diff changeset	477
55603 12fec73cb8e5 Merged revisions 73862,73872 via svnmerge from Georg Brandl <georg@python.org> parents: 55593 diff changeset	478 def test_writestr_extended_local_header_issue1202(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	479 with zipfile.ZipFile(TESTFN2, 'w') as orig_zip:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	480 for data in 'abcdefghijklmnop':
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	481 zinfo = zipfile.ZipInfo(data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	482 zinfo.flag_bits \|= 0x08 # Include an extended local header.
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	483 orig_zip.writestr(zinfo, data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	484
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	485 def test_close(self):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	486 """Check that the zipfile is closed after the 'with' block."""
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	487 with zipfile.ZipFile(TESTFN2, "w") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	488 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	489 zipfp.writestr(fpath, fdata)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	490 self.assertTrue(zipfp.fp is not None, 'zipfp is not open')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	491 self.assertTrue(zipfp.fp is None, 'zipfp is not closed')
55603 12fec73cb8e5 Merged revisions 73862,73872 via svnmerge from Georg Brandl <georg@python.org> parents: 55593 diff changeset	492
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	493 with zipfile.ZipFile(TESTFN2, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	494 self.assertTrue(zipfp.fp is not None, 'zipfp is not open')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	495 self.assertTrue(zipfp.fp is None, 'zipfp is not closed')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	496
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	497 def test_close_on_exception(self):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	498 """Check that the zipfile is closed if an exception is raised in the
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	499 'with' block."""
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	500 with zipfile.ZipFile(TESTFN2, "w") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	501 for fpath, fdata in SMALL_TEST_DATA:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	502 zipfp.writestr(fpath, fdata)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	503
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	504 try:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	505 with zipfile.ZipFile(TESTFN2, "r") as zipfp2:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	506 raise zipfile.BadZipFile()
a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	507 except zipfile.BadZipFile:
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	508 self.assertTrue(zipfp2.fp is None, 'zipfp is not closed')
55603 12fec73cb8e5 Merged revisions 73862,73872 via svnmerge from Georg Brandl <georg@python.org> parents: 55593 diff changeset	509
72992 12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	510 def test_add_file_before_1980(self):
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	511 # Set atime and mtime to 1970-01-01
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	512 os.utime(TESTFN, (0, 0))
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	513 with zipfile.ZipFile(TESTFN2, "w") as zipfp:
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	514 self.assertRaises(ValueError, zipfp.write, TESTFN)
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	515
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	516
68460 d2689ed3dc83 Skip test that requires zlib when zlib is not available. Ezio Melotti <ezio.melotti@gmail.com> parents: 68257 diff changeset	517 @skipUnless(zlib, "requires zlib")
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	518 def test_unicode_filenames(self):
67246 cd8c9b67f033 #10801: do not actually extract, just open() the files in the test zipfile. Georg Brandl <georg@python.org> parents: 67245 diff changeset	519 # bug #10801
cd8c9b67f033 #10801: do not actually extract, just open() the files in the test zipfile. Georg Brandl <georg@python.org> parents: 67245 diff changeset	520 fname = findfile('zip_cp437_header.zip')
67245 33543b4e0e5d #10801: In zipfile, support different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky. Georg Brandl <georg@python.org> parents: 67076 diff changeset	521 with zipfile.ZipFile(fname) as zipfp:
70757 33b7428e65b4 Issue #10801: Fix test_unicode_filenames() of test_zipfile Victor Stinner <victor.stinner@haypocalc.com> parents: 70278 diff changeset	522 for name in zipfp.namelist():
33b7428e65b4 Issue #10801: Fix test_unicode_filenames() of test_zipfile Victor Stinner <victor.stinner@haypocalc.com> parents: 70278 diff changeset	523 zipfp.open(name).close()
70183 1f0f0e317873 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support Victor Stinner <victor.stinner@haypocalc.com> parents: 67845 diff changeset	524
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	525 def tearDown(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	526 unlink(TESTFN)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	527 unlink(TESTFN2)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	528
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	529
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	530 class TestZip64InSmallFiles(unittest.TestCase):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	531 # These tests test the ZIP64 functionality without using large files,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	532 # see test_zipfile64 for proper tests.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	533
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	534 def setUp(self):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	535 self._limit = zipfile.ZIP64_LIMIT
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	536 zipfile.ZIP64_LIMIT = 5
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	537
42907 0170418dadea Changes in anticipation of stricter str vs. bytes enforcement. Guido van Rossum <guido@python.org> parents: 42838 diff changeset	538 line_gen = (bytes("Test of zipfile line %d." % i, "ascii")
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	539 for i in range(0, FIXEDTEST_SIZE))
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	540 self.data = b'\n'.join(line_gen)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	541
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	542 # Make a source file with some lines
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	543 with open(TESTFN, "wb") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	544 fp.write(self.data)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	545
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	546 def large_file_exception_test(self, f, compression):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	547 with zipfile.ZipFile(f, "w", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	548 self.assertRaises(zipfile.LargeZipFile,
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	549 zipfp.write, TESTFN, "another.name")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	550
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	551 def large_file_exception_test2(self, f, compression):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	552 with zipfile.ZipFile(f, "w", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	553 self.assertRaises(zipfile.LargeZipFile,
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	554 zipfp.writestr, "another.name", self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	555 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	556 f.close()
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	557
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	558 def test_large_file_exception(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	559 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	560 self.large_file_exception_test(f, zipfile.ZIP_STORED)
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	561 self.large_file_exception_test2(f, zipfile.ZIP_STORED)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	562
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	563 def zip_test(self, f, compression):
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	564 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	565 with zipfile.ZipFile(f, "w", compression, allowZip64=True) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	566 zipfp.write(TESTFN, "another.name")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	567 zipfp.write(TESTFN, TESTFN)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	568 zipfp.writestr("strfile", self.data)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	569
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	570 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	571 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	572 self.assertEqual(zipfp.read(TESTFN), self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	573 self.assertEqual(zipfp.read("another.name"), self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	574 self.assertEqual(zipfp.read("strfile"), self.data)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	575
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	576 # Print the ZIP directory
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	577 fp = io.StringIO()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	578 zipfp.printdir(fp)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	579
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	580 directory = fp.getvalue()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	581 lines = directory.splitlines()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	582 self.assertEqual(len(lines), 4) # Number of files + header
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	583
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	584 self.assertIn('File Name', lines[0])
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	585 self.assertIn('Modified', lines[0])
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	586 self.assertIn('Size', lines[0])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	587
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	588 fn, date, time_, size = lines[1].split()
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	589 self.assertEqual(fn, 'another.name')
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	590 self.assertTrue(time.strptime(date, '%Y-%m-%d'))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	591 self.assertTrue(time.strptime(time_, '%H:%M:%S'))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	592 self.assertEqual(size, str(len(self.data)))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	593
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	594 # Check the namelist
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	595 names = zipfp.namelist()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	596 self.assertEqual(len(names), 3)
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	597 self.assertIn(TESTFN, names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	598 self.assertIn("another.name", names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	599 self.assertIn("strfile", names)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	600
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	601 # Check infolist
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	602 infos = zipfp.infolist()
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	603 names = [i.filename for i in infos]
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	604 self.assertEqual(len(names), 3)
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	605 self.assertIn(TESTFN, names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	606 self.assertIn("another.name", names)
f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	607 self.assertIn("strfile", names)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	608 for i in infos:
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	609 self.assertEqual(i.file_size, len(self.data))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	610
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	611 # check getinfo
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	612 for nm in (TESTFN, "another.name", "strfile"):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	613 info = zipfp.getinfo(nm)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	614 self.assertEqual(info.filename, nm)
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	615 self.assertEqual(info.file_size, len(self.data))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	616
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	617 # Check that testzip doesn't raise an exception
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	618 zipfp.testzip()
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	619 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	620 f.close()
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	621
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	622 def test_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	623 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	624 self.zip_test(f, zipfile.ZIP_STORED)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	625
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	626 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	627 def test_deflated(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	628 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	629 self.zip_test(f, zipfile.ZIP_DEFLATED)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	630
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	631 def test_absolute_arcnames(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	632 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED,
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	633 allowZip64=True) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	634 zipfp.write(TESTFN, "/absolute")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	635
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	636 with zipfile.ZipFile(TESTFN2, "r", zipfile.ZIP_STORED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	637 self.assertEqual(zipfp.namelist(), ["absolute"])
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	638
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	639 def tearDown(self):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	640 zipfile.ZIP64_LIMIT = self._limit
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	641 unlink(TESTFN)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	642 unlink(TESTFN2)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	643
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	644
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	645 class PyZipFileTests(unittest.TestCase):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	646 def test_write_pyfile(self):
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	647 with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	648 fn = __file__
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	649 if fn.endswith('.pyc') or fn.endswith('.pyo'):
60648 7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	650 path_split = fn.split(os.sep)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	651 if os.altsep is not None:
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	652 path_split.extend(fn.split(os.altsep))
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	653 if '__pycache__' in path_split:
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	654 fn = imp.source_from_cache(fn)
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	655 else:
7b69e630d237 PEP 3147 Barry Warsaw <barry@python.org> parents: 58822 diff changeset	656 fn = fn[:-1]
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	657
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	658 zipfp.writepy(fn)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	659
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	660 bn = os.path.basename(fn)
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	661 self.assertNotIn(bn, zipfp.namelist())
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	662 self.assertTrue(bn + 'o' in zipfp.namelist() or
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	663 bn + 'c' in zipfp.namelist())
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	664
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	665 with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	666 fn = __file__
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	667 if fn.endswith(('.pyc', '.pyo')):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	668 fn = fn[:-1]
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	669
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	670 zipfp.writepy(fn, "testpackage")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	671
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	672 bn = "%s/%s" % ("testpackage", os.path.basename(fn))
58415 f6a626f34840 use assert[Not]In where appropriate Benjamin Peterson <benjamin@python.org> parents: 58033 diff changeset	673 self.assertNotIn(bn, zipfp.namelist())
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	674 self.assertTrue(bn + 'o' in zipfp.namelist() or
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	675 bn + 'c' in zipfp.namelist())
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	676
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	677 def test_write_python_package(self):
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	678 import email
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	679 packagedir = os.path.dirname(email.__file__)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	680
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	681 with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	682 zipfp.writepy(packagedir)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	683
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	684 # Check for a couple of modules at different levels of the
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	685 # hierarchy
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	686 names = zipfp.namelist()
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	687 self.assertTrue('email/__init__.pyo' in names or
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	688 'email/__init__.pyc' in names)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	689 self.assertTrue('email/mime/text.pyo' in names or
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	690 'email/mime/text.pyc' in names)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	691
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	692 def test_write_with_optimization(self):
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	693 import email
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	694 packagedir = os.path.dirname(email.__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	695 # use .pyc if running test in optimization mode,
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	696 # use .pyo if running test in debug mode
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	697 optlevel = 1 if __debug__ else 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	698 ext = '.pyo' if optlevel == 1 else '.pyc'
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	699
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	700 with TemporaryFile() as t, \
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	701 zipfile.PyZipFile(t, "w", optimize=optlevel) as zipfp:
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	702 zipfp.writepy(packagedir)
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	703
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	704 names = zipfp.namelist()
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	705 self.assertIn('email/__init__' + ext, names)
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	706 self.assertIn('email/mime/text' + ext, names)
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	707
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	708 def test_write_python_directory(self):
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	709 os.mkdir(TESTFN2)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	710 try:
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	711 with open(os.path.join(TESTFN2, "mod1.py"), "w") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	712 fp.write("print(42)\n")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	713
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	714 with open(os.path.join(TESTFN2, "mod2.py"), "w") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	715 fp.write("print(42 * 42)\n")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	716
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	717 with open(os.path.join(TESTFN2, "mod2.txt"), "w") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	718 fp.write("bla bla bla\n")
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	719
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	720 with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	721 zipfp.writepy(TESTFN2)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	722
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	723 names = zipfp.namelist()
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	724 self.assertTrue('mod1.pyc' in names or 'mod1.pyo' in names)
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	725 self.assertTrue('mod2.pyc' in names or 'mod2.pyo' in names)
260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	726 self.assertNotIn('mod2.txt', names)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	727
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	728 finally:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	729 shutil.rmtree(TESTFN2)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	730
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	731 def test_write_non_pyfile(self):
66409 260ff379115c zipfile: remove remaining ResourceWarnings Łukasz Langa <lukasz@langa.pl> parents: 66225 diff changeset	732 with TemporaryFile() as t, zipfile.PyZipFile(t, "w") as zipfp:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	733 with open(TESTFN, 'w') as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	734 f.write('most definitely not a python file')
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	735 self.assertRaises(RuntimeError, zipfp.writepy, TESTFN)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	736 os.remove(TESTFN)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	737
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36630 diff changeset	738
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	739 class OtherTests(unittest.TestCase):
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	740 zips_with_bad_crc = {
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	741 zipfile.ZIP_STORED: (
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	742 b'PK\003\004\024\0\0\0\0\0 \213\212;:r'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	743 b'\253\377\f\0\0\0\f\0\0\0\005\0\0\000af'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	744 b'ilehello,AworldP'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	745 b'K\001\002\024\003\024\0\0\0\0\0 \213\212;:'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	746 b'r\253\377\f\0\0\0\f\0\0\0\005\0\0\0\0'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	747 b'\0\0\0\0\0\0\0\200\001\0\0\0\000afi'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	748 b'lePK\005\006\0\0\0\0\001\0\001\0003\000'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	749 b'\0\0/\0\0\0\0\0'),
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	750 zipfile.ZIP_DEFLATED: (
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	751 b'PK\x03\x04\x14\x00\x00\x00\x08\x00n}\x0c=FA'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	752 b'KE\x10\x00\x00\x00n\x00\x00\x00\x05\x00\x00\x00af'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	753 b'ile\xcbH\xcd\xc9\xc9W(\xcf/\xcaI\xc9\xa0'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	754 b'=\x13\x00PK\x01\x02\x14\x03\x14\x00\x00\x00\x08\x00n'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	755 b'}\x0c=FAKE\x10\x00\x00\x00n\x00\x00\x00\x05'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	756 b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x01\x00\x00\x00'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	757 b'\x00afilePK\x05\x06\x00\x00\x00\x00\x01\x00'
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	758 b'\x01\x003\x00\x00\x003\x00\x00\x00\x00\x00'),
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	759 }
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	760
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	761 def test_unicode_filenames(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	762 with zipfile.ZipFile(TESTFN, "w") as zf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	763 zf.writestr("foo.txt", "Test for unicode filename")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	764 zf.writestr("\xf6.txt", "Test for unicode filename")
58473 71acd4482e65 Merged revisions 77727 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58415 diff changeset	765 self.assertIsInstance(zf.infolist()[0].filename, str)
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 44999 diff changeset	766
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	767 with zipfile.ZipFile(TESTFN, "r") as zf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	768 self.assertEqual(zf.filelist[0].filename, "foo.txt")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	769 self.assertEqual(zf.filelist[1].filename, "\xf6.txt")
46672 15f1d232eae9 Merged revisions 62724 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 44999 diff changeset	770
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	771 def test_create_non_existent_file_for_append(self):
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	772 if os.path.exists(TESTFN):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	773 os.unlink(TESTFN)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	774
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	775 filename = 'testfile.txt'
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	776 content = b'hello, world. this is some content.'
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	777
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	778 try:
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	779 with zipfile.ZipFile(TESTFN, 'a') as zf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	780 zf.writestr(filename, content)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	781 except IOError:
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	782 self.fail('Could not append data to a non-existent zip file.')
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	783
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	784 self.assertTrue(os.path.exists(TESTFN))
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	785
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	786 with zipfile.ZipFile(TESTFN, 'r') as zf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	787 self.assertEqual(zf.read(filename), content)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	788
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	789 def test_close_erroneous_file(self):
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	790 # This test checks that the ZipFile constructor closes the file object
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	791 # it opens if there's an error in the file. If it doesn't, the
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	792 # traceback holds a reference to the ZipFile object and, indirectly,
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	793 # the file object.
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	794 # On Windows, this causes the os.unlink() call to fail because the
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	795 # underlying file is still open. This is SF bug #412214.
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	796 #
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	797 with open(TESTFN, "w") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	798 fp.write("this is not a legal zip file\n")
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	799 try:
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	800 zf = zipfile.ZipFile(TESTFN)
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	801 except zipfile.BadZipFile:
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	802 pass
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	803
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	804 def test_is_zip_erroneous_file(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	805 """Check that is_zipfile() correctly identifies non-zip files."""
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	806 # - passing a filename
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	807 with open(TESTFN, "w") as fp:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	808 fp.write("this is not a legal zip file\n")
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	809 chk = zipfile.is_zipfile(TESTFN)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	810 self.assertFalse(chk)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	811 # - passing a file object
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	812 with open(TESTFN, "rb") as fp:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	813 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	814 self.assertTrue(not chk)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	815 # - passing a file-like object
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	816 fp = io.BytesIO()
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	817 fp.write(b"this is not a legal zip file\n")
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	818 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	819 self.assertTrue(not chk)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	820 fp.seek(0, 0)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	821 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	822 self.assertTrue(not chk)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	823
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	824 def test_is_zip_valid_file(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	825 """Check that is_zipfile() correctly identifies zip files."""
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	826 # - passing a filename
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	827 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	828 zipf.writestr("foo.txt", b"O, for a Muse of Fire!")
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	829
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	830 chk = zipfile.is_zipfile(TESTFN)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	831 self.assertTrue(chk)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	832 # - passing a file object
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	833 with open(TESTFN, "rb") as fp:
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	834 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	835 self.assertTrue(chk)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	836 fp.seek(0, 0)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	837 zip_contents = fp.read()
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	838 # - passing a file-like object
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	839 fp = io.BytesIO()
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	840 fp.write(zip_contents)
fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	841 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	842 self.assertTrue(chk)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	843 fp.seek(0, 0)
50301 fec72c9b271d Merged revisions 67946 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 48572 diff changeset	844 chk = zipfile.is_zipfile(fp)
55593 0bb232078b8c Merged revisions 73715 via svnmerge from Georg Brandl <georg@python.org> parents: 54313 diff changeset	845 self.assertTrue(chk)
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	846
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	847 def test_non_existent_file_raises_IOError(self):
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	848 # make sure we don't raise an AttributeError when a partially-constructed
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	849 # ZipFile instance is finalized; this tests for regression on SF tracker
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	850 # bug #403871.
17312 7635f8838c68 Sf bug [ #412214 ] ZipFile constructor leaves files open. Tim Peters <tim.peters@gmail.com> parents: 17245 diff changeset	851
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	852 # The bug we're testing for caused an AttributeError to be raised
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	853 # when a ZipFile instance was created for a file that did not
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	854 # exist; the .fp member was not initialized but was needed by the
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	855 # __del__() method. Since the AttributeError is in the __del__(),
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	856 # it is ignored, but the user should be sufficiently annoyed by
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	857 # the message on the output that regression will be noticed
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	858 # quickly.
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	859 self.assertRaises(IOError, zipfile.ZipFile, TESTFN)
29625 7d41785fb60c SF patch #756996: Bare except in ZipFile.testzip() Raymond Hettinger <python@rcn.com> parents: 24364 diff changeset	860
58176 b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 55603 diff changeset	861 def test_empty_file_raises_BadZipFile(self):
b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 55603 diff changeset	862 f = open(TESTFN, 'w')
b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 55603 diff changeset	863 f.close()
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	864 self.assertRaises(zipfile.BadZipFile, zipfile.ZipFile, TESTFN)
58176 b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 55603 diff changeset	865
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	866 with open(TESTFN, 'w') as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	867 fp.write("short file")
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	868 self.assertRaises(zipfile.BadZipFile, zipfile.ZipFile, TESTFN)
58176 b3bb8b3e5e4e Merged revisions 74246 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 55603 diff changeset	869
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	870 def test_closed_zip_raises_RuntimeError(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	871 """Verify that testzip() doesn't swallow inappropriate exceptions."""
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	872 data = io.BytesIO()
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	873 with zipfile.ZipFile(data, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	874 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	875
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	876 # This is correct; calling .read on a closed ZipFile should throw
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	877 # a RuntimeError, and so should calling .testzip. An earlier
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	878 # version of .testzip would swallow this exception (and any other)
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	879 # and report that the first file in the archive was corrupt.
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	880 self.assertRaises(RuntimeError, zipf.read, "foo.txt")
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	881 self.assertRaises(RuntimeError, zipf.open, "foo.txt")
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	882 self.assertRaises(RuntimeError, zipf.testzip)
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	883 self.assertRaises(RuntimeError, zipf.writestr, "bogus.txt", "bogus")
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	884 with open(TESTFN, 'w') as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	885 f.write('zipfile test data')
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	886 self.assertRaises(RuntimeError, zipf.write, TESTFN)
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	887
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	888 def test_bad_constructor_mode(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	889 """Check that bad modes passed to ZipFile constructor are caught."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	890 self.assertRaises(RuntimeError, zipfile.ZipFile, TESTFN, "q")
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	891
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	892 def test_bad_open_mode(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	893 """Check that bad modes passed to ZipFile.open are caught."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	894 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	895 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	896
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	897 with zipfile.ZipFile(TESTFN, mode="r") as zipf:
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	898 # read the data to make sure the file is there
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	899 zipf.read("foo.txt")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	900 self.assertRaises(RuntimeError, zipf.open, "foo.txt", "q")
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	901
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	902 def test_read0(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	903 """Check that calling read(0) on a ZipExtFile object returns an empty
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	904 string and doesn't advance file pointer."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	905 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	906 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	907 # read the data to make sure the file is there
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	908 with zipf.open("foo.txt") as f:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	909 for i in range(FIXEDTEST_SIZE):
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	910 self.assertEqual(f.read(0), b'')
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	911
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	912 self.assertEqual(f.read(), b"O, for a Muse of Fire!")
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	913
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	914 def test_open_non_existent_item(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	915 """Check that attempting to call open() for an item that doesn't
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	916 exist in the archive raises a RuntimeError."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	917 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	918 self.assertRaises(KeyError, zipf.open, "foo.txt", "r")
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	919
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	920 def test_bad_compression_mode(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	921 """Check that bad compression methods passed to ZipFile.open are
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	922 caught."""
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	923 self.assertRaises(RuntimeError, zipfile.ZipFile, TESTFN, "w", -1)
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 41812 diff changeset	924
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	925 def test_null_byte_in_filename(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	926 """Check that a filename containing a null byte is properly
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	927 terminated."""
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	928 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	929 zipf.writestr("foo.txt\x00qqq", b"O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	930 self.assertEqual(zipf.namelist(), ['foo.txt'])
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	931
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	932 def test_struct_sizes(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	933 """Check that ZIP internal structure sizes are calculated correctly."""
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	934 self.assertEqual(zipfile.sizeEndCentDir, 22)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	935 self.assertEqual(zipfile.sizeCentralDir, 46)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	936 self.assertEqual(zipfile.sizeEndCentDir64, 56)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	937 self.assertEqual(zipfile.sizeEndCentDir64Locator, 20)
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	938
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	939 def test_comments(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	940 """Check that comments on the archive are handled properly."""
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	941
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	942 # check default comment is empty
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	943 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	944 self.assertEqual(zipf.comment, b'')
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	945 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	946
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	947 with zipfile.ZipFile(TESTFN, mode="r") as zipfr:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	948 self.assertEqual(zipfr.comment, b'')
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	949
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	950 # check a simple short comment
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	951 comment = b'Bravely taking to his feet, he beat a very brave retreat.'
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	952 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	953 zipf.comment = comment
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	954 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	955 with zipfile.ZipFile(TESTFN, mode="r") as zipfr:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	956 self.assertEqual(zipf.comment, comment)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	957
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	958 # check a comment of max length
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	959 comment2 = ''.join(['%d' % (i**3 % 10) for i in range((1 << 16)-1)])
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	960 comment2 = comment2.encode("ascii")
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	961 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	962 zipf.comment = comment2
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	963 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	964
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	965 with zipfile.ZipFile(TESTFN, mode="r") as zipfr:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	966 self.assertEqual(zipfr.comment, comment2)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	967
cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	968 # check a comment that is too long is truncated
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	969 with zipfile.ZipFile(TESTFN, mode="w") as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	970 zipf.comment = comment2 + b'oops'
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	971 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	972 with zipfile.ZipFile(TESTFN, mode="r") as zipfr:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	973 self.assertEqual(zipfr.comment, comment2)
48423 cdaac79a7237 Merged revisions 64688 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47278 diff changeset	974
77873 e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	975 # check that comments are correctly modified in append mode
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	976 with zipfile.ZipFile(TESTFN,mode="w") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	977 zipf.comment = b"original comment"
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	978 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	979 with zipfile.ZipFile(TESTFN,mode="a") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	980 zipf.comment = b"an updated comment"
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	981 with zipfile.ZipFile(TESTFN,mode="r") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	982 self.assertEqual(zipf.comment, b"an updated comment")
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	983
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	984 # check that comments are correctly shortened in append mode
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	985 with zipfile.ZipFile(TESTFN,mode="w") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	986 zipf.comment = b"original comment that's longer"
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	987 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	988 with zipfile.ZipFile(TESTFN,mode="a") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	989 zipf.comment = b"shorter comment"
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	990 with zipfile.ZipFile(TESTFN,mode="r") as zipf:
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	991 self.assertEqual(zipf.comment, b"shorter comment")
e13c9f99fbae Issue #9239: add tests for modifying zipfile comments in append mode. Antoine Pitrou <solipsis@pitrou.net> parents: 76270 diff changeset	992
76270 4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	993 def test_unicode_comment(self):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	994 with zipfile.ZipFile(TESTFN, "w", zipfile.ZIP_STORED) as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	995 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	996 with self.assertRaises(TypeError):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	997 zipf.comment = "this is an error"
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	998
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	999 def test_change_comment_in_empty_archive(self):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1000 with zipfile.ZipFile(TESTFN, "a", zipfile.ZIP_STORED) as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1001 self.assertFalse(zipf.filelist)
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1002 zipf.comment = b"this is a comment"
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1003 with zipfile.ZipFile(TESTFN, "r") as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1004 self.assertEqual(zipf.comment, b"this is a comment")
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1005
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1006 def test_change_comment_in_nonempty_archive(self):
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1007 with zipfile.ZipFile(TESTFN, "w", zipfile.ZIP_STORED) as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1008 zipf.writestr("foo.txt", "O, for a Muse of Fire!")
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1009 with zipfile.ZipFile(TESTFN, "a", zipfile.ZIP_STORED) as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1010 self.assertTrue(zipf.filelist)
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1011 zipf.comment = b"this is a comment"
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1012 with zipfile.ZipFile(TESTFN, "r") as zipf:
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1013 self.assertEqual(zipf.comment, b"this is a comment")
4186f20d9fa4 #14399: zipfile now correctly handles comments added to empty zipfiles. R David Murray <rdmurray@bitdance.com> parents: 72992 diff changeset	1014
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1015 def check_testzip_with_bad_crc(self, compression):
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1016 """Tests that files with bad CRCs return their name from testzip."""
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1017 zipdata = self.zips_with_bad_crc[compression]
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1018
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	1019 with zipfile.ZipFile(io.BytesIO(zipdata), mode="r") as zipf:
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	1020 # testzip returns the name of the first corrupt file, or None
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	1021 self.assertEqual('afile', zipf.testzip())
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1022
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1023 def test_testzip_with_bad_crc_stored(self):
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1024 self.check_testzip_with_bad_crc(zipfile.ZIP_STORED)
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1025
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	1026 @skipUnless(zlib, "requires zlib")
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	1027 def test_testzip_with_bad_crc_deflated(self):
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	1028 self.check_testzip_with_bad_crc(zipfile.ZIP_DEFLATED)
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1029
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1030 def check_read_with_bad_crc(self, compression):
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1031 """Tests that files with bad CRCs raise a BadZipFile exception when read."""
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1032 zipdata = self.zips_with_bad_crc[compression]
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1033
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1034 # Using ZipFile.read()
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	1035 with zipfile.ZipFile(io.BytesIO(zipdata), mode="r") as zipf:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1036 self.assertRaises(zipfile.BadZipFile, zipf.read, 'afile')
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1037
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1038 # Using ZipExtFile.read()
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	1039 with zipfile.ZipFile(io.BytesIO(zipdata), mode="r") as zipf:
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	1040 with zipf.open('afile', 'r') as corrupt_file:
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1041 self.assertRaises(zipfile.BadZipFile, corrupt_file.read)
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1042
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1043 # Same with small reads (in order to exercise the buffering logic)
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	1044 with zipfile.ZipFile(io.BytesIO(zipdata), mode="r") as zipf:
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	1045 with zipf.open('afile', 'r') as corrupt_file:
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	1046 corrupt_file.MIN_READ_SIZE = 2
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1047 with self.assertRaises(zipfile.BadZipFile):
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	1048 while corrupt_file.read(2):
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	1049 pass
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1050
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1051 def test_read_with_bad_crc_stored(self):
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1052 self.check_read_with_bad_crc(zipfile.ZIP_STORED)
68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1053
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	1054 @skipUnless(zlib, "requires zlib")
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	1055 def test_read_with_bad_crc_deflated(self):
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	1056 self.check_read_with_bad_crc(zipfile.ZIP_DEFLATED)
63936 68c48f8aa555 Merged revisions 83959-83960 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58176 diff changeset	1057
64673 67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1058 def check_read_return_size(self, compression):
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1059 # Issue #9837: ZipExtFile.read() shouldn't return more bytes
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1060 # than requested.
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1061 for test_size in (1, 4095, 4096, 4097, 16384):
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1062 file_size = test_size + 1
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1063 junk = b''.join(struct.pack('B', randint(0, 255))
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1064 for x in range(file_size))
64672 fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1065 with zipfile.ZipFile(io.BytesIO(), "w", compression) as zipf:
64673 67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1066 zipf.writestr('foo', junk)
64672 fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1067 with zipf.open('foo', 'r') as fp:
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1068 buf = fp.read(test_size)
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1069 self.assertEqual(len(buf), test_size)
64673 67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1070
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1071 def test_read_return_size_stored(self):
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1072 self.check_read_return_size(zipfile.ZIP_STORED)
67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1073
64672 fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1074 @skipUnless(zlib, "requires zlib")
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1075 def test_read_return_size_deflated(self):
fb90f2ff1764 Issue #9837: The read() method of ZipExtFile objects (as returned by Antoine Pitrou <solipsis@pitrou.net> parents: 63933 diff changeset	1076 self.check_read_return_size(zipfile.ZIP_DEFLATED)
64673 67ed6d4f70b1 Merged revisions 84737 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63936 diff changeset	1077
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1078 def test_empty_zipfile(self):
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1079 # Check that creating a file in 'w' or 'a' mode and closing without
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1080 # adding any files to the archives creates a valid empty ZIP file
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1081 zipf = zipfile.ZipFile(TESTFN, mode="w")
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1082 zipf.close()
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1083 try:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1084 zipf = zipfile.ZipFile(TESTFN, mode="r")
65290 ba6581ecb6f1 #1710703: write zipfile structures also in the case of closing a new, but empty, archive. Georg Brandl <georg@python.org> parents: 64672 diff changeset	1085 except zipfile.BadZipFile:
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1086 self.fail("Unable to create empty ZIP file in 'w' mode")
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1087
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1088 zipf = zipfile.ZipFile(TESTFN, mode="a")
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1089 zipf.close()
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1090 try:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1091 zipf = zipfile.ZipFile(TESTFN, mode="r")
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1092 except:
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1093 self.fail("Unable to create empty ZIP file in 'a' mode")
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1094
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1095 def test_open_empty_file(self):
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1096 # Issue 1710703: Check that opening a file with less than 22 bytes
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1097 # raises a BadZipFile exception (rather than the previously unhelpful
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1098 # IOError)
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1099 f = open(TESTFN, 'w')
a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1100 f.close()
65673 a281989a218b #7351: add more consistent exception name alias. Georg Brandl <georg@python.org> parents: 65290 diff changeset	1101 self.assertRaises(zipfile.BadZipFile, zipfile.ZipFile, TESTFN, 'r')
66469 a372fc486281 Merged revisions 85450-85455,85460-85465 via svnmerge from Georg Brandl <georg@python.org> parents: 66340 diff changeset	1102
72992 12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	1103 def test_create_zipinfo_before_1980(self):
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	1104 self.assertRaises(ValueError,
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	1105 zipfile.ZipInfo, 'seventies', (1979, 1, 1, 0, 0, 0))
12f3e86e9041 3.2 - Fix closes Issue6090 - Raise a ValueError, instead of failing with unrelated Senthil Kumaran <senthil@uthcode.com> parents: 70758 diff changeset	1106
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1107 def tearDown(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1108 unlink(TESTFN)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1109 unlink(TESTFN2)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1110
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1111
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1112 class DecryptionTests(unittest.TestCase):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1113 """Check that ZIP decryption works. Since the library does not
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1114 support encryption at the moment, we use a pre-generated encrypted
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1115 ZIP file."""
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1116
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1117 data = (
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1118 b'PK\x03\x04\x14\x00\x01\x00\x00\x00n\x92i.#y\xef?&\x00\x00\x00\x1a\x00'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1119 b'\x00\x00\x08\x00\x00\x00test.txt\xfa\x10\xa0gly\|\xfa-\xc5\xc0=\xf9y'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1120 b'\x18\xe0\xa8r\xb3Z}Lg\xbc\xae\xf9\|\x9b\x19\xe4\x8b\xba\xbb)\x8c\xb0\xdbl'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1121 b'PK\x01\x02\x14\x00\x14\x00\x01\x00\x00\x00n\x92i.#y\xef?&\x00\x00\x00'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1122 b'\x1a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x01\x00 \x00\xb6\x81'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1123 b'\x00\x00\x00\x00test.txtPK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x006\x00'
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1124 b'\x00\x00L\x00\x00\x00\x00\x00' )
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1125 data2 = (
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1126 b'PK\x03\x04\x14\x00\t\x00\x08\x00\xcf}38xu\xaa\xb2\x14\x00\x00\x00\x00\x02'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1127 b'\x00\x00\x04\x00\x15\x00zeroUT\t\x00\x03\xd6\x8b\x92G\xda\x8b\x92GUx\x04'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1128 b'\x00\xe8\x03\xe8\x03\xc7<M\xb5a\xceX\xa3Y&\x8b{oE\xd7\x9d\x8c\x98\x02\xc0'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1129 b'PK\x07\x08xu\xaa\xb2\x14\x00\x00\x00\x00\x02\x00\x00PK\x01\x02\x17\x03'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1130 b'\x14\x00\t\x00\x08\x00\xcf}38xu\xaa\xb2\x14\x00\x00\x00\x00\x02\x00\x00'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1131 b'\x04\x00\r\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00ze'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1132 b'roUT\x05\x00\x03\xd6\x8b\x92GUx\x00\x00PK\x05\x06\x00\x00\x00\x00\x01'
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1133 b'\x00\x01\x00?\x00\x00\x00[\x00\x00\x00\x00\x00' )
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1134
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1135 plain = b'zipfile.py encryption test'
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1136 plain2 = b'\x00'*512
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1137
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1138 def setUp(self):
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1139 with open(TESTFN, "wb") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1140 fp.write(self.data)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1141 self.zip = zipfile.ZipFile(TESTFN, "r")
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1142 with open(TESTFN2, "wb") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1143 fp.write(self.data2)
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1144 self.zip2 = zipfile.ZipFile(TESTFN2, "r")
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1145
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1146 def tearDown(self):
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1147 self.zip.close()
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1148 os.unlink(TESTFN)
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1149 self.zip2.close()
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1150 os.unlink(TESTFN2)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1151
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1152 def test_no_password(self):
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1153 # Reading the encrypted file without password
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1154 # must generate a RunTime exception
32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1155 self.assertRaises(RuntimeError, self.zip.read, "test.txt")
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1156 self.assertRaises(RuntimeError, self.zip2.read, "zero")
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1157
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1158 def test_bad_password(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1159 self.zip.setpassword(b"perl")
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1160 self.assertRaises(RuntimeError, self.zip.read, "test.txt")
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1161 self.zip2.setpassword(b"perl")
fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1162 self.assertRaises(RuntimeError, self.zip2.read, "zero")
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1163
55921 5111d3299741 Merged revisions 74754 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55486 diff changeset	1164 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1165 def test_good_password(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1166 self.zip.setpassword(b"python")
66340 2beb25369289 Merged revisions 86596 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 64673 diff changeset	1167 self.assertEqual(self.zip.read("test.txt"), self.plain)
44810 fa6cee14dcba Merged revisions 60094-60123 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44587 diff changeset	1168 self.zip2.setpassword(b"12345")
66340 2beb25369289 Merged revisions 86596 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 64673 diff changeset	1169 self.assertEqual(self.zip2.read("zero"), self.plain2)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40793 diff changeset	1170
67077 561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1171 def test_unicode_password(self):
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1172 self.assertRaises(TypeError, self.zip.setpassword, "unicode")
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1173 self.assertRaises(TypeError, self.zip.read, "test.txt", "python")
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1174 self.assertRaises(TypeError, self.zip.open, "test.txt", pwd="python")
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1175 self.assertRaises(TypeError, self.zip.extract, "test.txt", pwd="python")
561ea640188b Merged revisions 87430 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 66469 diff changeset	1176
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1177
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1178 class TestsWithRandomBinaryFiles(unittest.TestCase):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1179 def setUp(self):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1180 datacount = randint(16, 64)*1024 + randint(1, 1024)
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1181 self.data = b''.join(struct.pack('<f', random()*randint(-1000, 1000))
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1182 for i in range(datacount))
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1183
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1184 # Make a source file with some lines
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1185 with open(TESTFN, "wb") as fp:
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1186 fp.write(self.data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1187
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1188 def tearDown(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1189 unlink(TESTFN)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1190 unlink(TESTFN2)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1191
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1192 def make_test_archive(self, f, compression):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1193 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1194 with zipfile.ZipFile(f, "w", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1195 zipfp.write(TESTFN, "another.name")
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1196 zipfp.write(TESTFN, TESTFN)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1197
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1198 def zip_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1199 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1200
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1201 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1202 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1203 testdata = zipfp.read(TESTFN)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1204 self.assertEqual(len(testdata), len(self.data))
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1205 self.assertEqual(testdata, self.data)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1206 self.assertEqual(zipfp.read("another.name"), self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1207 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1208 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1209
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1210 def test_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1211 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1212 self.zip_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1213
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	1214 @skipUnless(zlib, "requires zlib")
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	1215 def test_deflated(self):
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	1216 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
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	1217 self.zip_test(f, zipfile.ZIP_DEFLATED)
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	1218
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1219 def zip_open_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1220 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1221
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1222 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1223 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1224 zipdata1 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1225 with zipfp.open(TESTFN) as zipopen1:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1226 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1227 read_data = zipopen1.read(256)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1228 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1229 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1230 zipdata1.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1231
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1232 zipdata2 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1233 with zipfp.open("another.name") as zipopen2:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1234 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1235 read_data = zipopen2.read(256)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1236 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1237 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1238 zipdata2.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1239
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1240 testdata1 = b''.join(zipdata1)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1241 self.assertEqual(len(testdata1), len(self.data))
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1242 self.assertEqual(testdata1, self.data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1243
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1244 testdata2 = b''.join(zipdata2)
58033 bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1245 self.assertEqual(len(testdata2), len(self.data))
bf97acf8ecb1 Merged revisions 77178 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58004 diff changeset	1246 self.assertEqual(testdata2, self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1247 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1248 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1249
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1250 def test_open_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1251 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1252 self.zip_open_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1253
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	1254 @skipUnless(zlib, "requires zlib")
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	1255 def test_open_deflated(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1256 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
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	1257 self.zip_open_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1258
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1259 def zip_random_open_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1260 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1261
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1262 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1263 with zipfile.ZipFile(f, "r", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1264 zipdata1 = []
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1265 with zipfp.open(TESTFN) as zipopen1:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1266 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1267 read_data = zipopen1.read(randint(1, 1024))
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1268 if not read_data:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1269 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1270 zipdata1.append(read_data)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1271
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1272 testdata = b''.join(zipdata1)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1273 self.assertEqual(len(testdata), len(self.data))
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1274 self.assertEqual(testdata, self.data)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1275 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1276 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1277
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1278 def test_random_open_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1279 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1280 self.zip_random_open_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1281
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	1282 @skipUnless(zlib, "requires zlib")
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	1283 def test_random_open_deflated(self):
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	1284 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
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	1285 self.zip_random_open_test(f, zipfile.ZIP_DEFLATED)
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	1286
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1287
55921 5111d3299741 Merged revisions 74754 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55486 diff changeset	1288 @skipUnless(zlib, "requires zlib")
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1289 class TestsWithMultipleOpens(unittest.TestCase):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1290 def setUp(self):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1291 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1292 with zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_DEFLATED) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1293 zipfp.writestr('ones', '1'*FIXEDTEST_SIZE)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1294 zipfp.writestr('twos', '2'*FIXEDTEST_SIZE)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1295
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1296 def test_same_file(self):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1297 # Verify that (when the ZipFile is in control of creating file objects)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1298 # multiple open() calls can be made without interfering with each other.
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1299 with zipfile.ZipFile(TESTFN2, mode="r") as zipf:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1300 with zipf.open('ones') as zopen1, zipf.open('ones') as zopen2:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1301 data1 = zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1302 data2 = zopen2.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1303 data1 += zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1304 data2 += zopen2.read(500)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1305 self.assertEqual(data1, data2)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1306
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1307 def test_different_file(self):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1308 # Verify that (when the ZipFile is in control of creating file objects)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1309 # multiple open() calls can be made without interfering with each other.
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1310 with zipfile.ZipFile(TESTFN2, mode="r") as zipf:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1311 with zipf.open('ones') as zopen1, zipf.open('twos') as zopen2:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1312 data1 = zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1313 data2 = zopen2.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1314 data1 += zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1315 data2 += zopen2.read(500)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1316 self.assertEqual(data1, b'1'*FIXEDTEST_SIZE)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1317 self.assertEqual(data2, b'2'*FIXEDTEST_SIZE)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1318
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1319 def test_interleaved(self):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1320 # Verify that (when the ZipFile is in control of creating file objects)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1321 # multiple open() calls can be made without interfering with each other.
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1322 with zipfile.ZipFile(TESTFN2, mode="r") as zipf:
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1323 with zipf.open('ones') as zopen1, zipf.open('twos') as zopen2:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1324 data1 = zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1325 data2 = zopen2.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1326 data1 += zopen1.read(500)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1327 data2 += zopen2.read(500)
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1328 self.assertEqual(data1, b'1'*FIXEDTEST_SIZE)
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1329 self.assertEqual(data2, b'2'*FIXEDTEST_SIZE)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1330
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1331 def tearDown(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1332 unlink(TESTFN2)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1333
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1334
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1335 class TestWithDirectory(unittest.TestCase):
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1336 def setUp(self):
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1337 os.mkdir(TESTFN2)
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1338
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1339 def test_extract_dir(self):
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1340 with zipfile.ZipFile(findfile("zipdir.zip")) as zipf:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1341 zipf.extractall(TESTFN2)
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1342 self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a")))
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1343 self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a", "b")))
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1344 self.assertTrue(os.path.exists(os.path.join(TESTFN2, "a", "b", "c")))
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1345
54313 538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 51001 diff changeset	1346 def test_bug_6050(self):
538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 51001 diff changeset	1347 # Extraction should succeed if directories already exist
538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 51001 diff changeset	1348 os.mkdir(os.path.join(TESTFN2, "a"))
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1349 self.test_extract_dir()
54313 538f4e774c18 Merged revisions 72893 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 51001 diff changeset	1350
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1351 def test_store_dir(self):
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1352 os.mkdir(os.path.join(TESTFN2, "x"))
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1353 zipf = zipfile.ZipFile(TESTFN, "w")
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1354 zipf.write(os.path.join(TESTFN2, "x"), "x")
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1355 self.assertTrue(zipf.filelist[0].filename.endswith("x/"))
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1356
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1357 def tearDown(self):
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1358 shutil.rmtree(TESTFN2)
cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1359 if os.path.exists(TESTFN):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1360 unlink(TESTFN)
51001 cef0fcc91559 Merged revisions 68885 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 50301 diff changeset	1361
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1362
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1363 class UniversalNewlineTests(unittest.TestCase):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1364 def setUp(self):
42907 0170418dadea Changes in anticipation of stricter str vs. bytes enforcement. Guido van Rossum <guido@python.org> parents: 42838 diff changeset	1365 self.line_gen = [bytes("Test of zipfile line %d." % i, "ascii")
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1366 for i in range(FIXEDTEST_SIZE)]
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1367 self.seps = ('\r', '\r\n', '\n')
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1368 self.arcdata, self.arcfiles = {}, {}
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1369 for n, s in enumerate(self.seps):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1370 b = s.encode("ascii")
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1371 self.arcdata[s] = b.join(self.line_gen) + b
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1372 self.arcfiles[s] = '%s-%d' % (TESTFN, n)
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1373 f = open(self.arcfiles[s], "wb")
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1374 try:
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1375 f.write(self.arcdata[s])
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1376 finally:
50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1377 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1378
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1379 def make_test_archive(self, f, compression):
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1380 # Create the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1381 with zipfile.ZipFile(f, "w", compression) as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1382 for fn in self.arcfiles.values():
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1383 zipfp.write(fn, fn)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1384
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1385 def read_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1386 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1387
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1388 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1389 with zipfile.ZipFile(f, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1390 for sep, fn in self.arcfiles.items():
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1391 with zipfp.open(fn, "rU") as fp:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1392 zipdata = fp.read()
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1393 self.assertEqual(self.arcdata[sep], zipdata)
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1394 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1395 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1396
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1397 def readline_read_test(self, f, compression):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1398 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1399
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1400 # Read the ZIP archive
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1401 with zipfile.ZipFile(f, "r") as zipfp:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1402 for sep, fn in self.arcfiles.items():
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1403 with zipfp.open(fn, "rU") as zipopen:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1404 data = b''
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1405 while True:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1406 read = zipopen.readline()
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1407 if not read:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1408 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1409 data += read
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1410
66225 cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1411 read = zipopen.read(5)
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1412 if not read:
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1413 break
cdc39f6bebf1 Fix #8886. Use context managers throughout the test. Brian Curtin <brian.curtin@gmail.com> parents: 65830 diff changeset	1414 data += read
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1415
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1416 self.assertEqual(data, self.arcdata['\n'])
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1417
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1418 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1419 f.close()
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1420
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1421 def readline_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1422 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1423
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1424 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1425 with zipfile.ZipFile(f, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1426 for sep, fn in self.arcfiles.items():
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1427 with zipfp.open(fn, "rU") as zipopen:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1428 for line in self.line_gen:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1429 linedata = zipopen.readline()
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1430 self.assertEqual(linedata, line + b'\n')
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1431 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1432 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1433
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1434 def readlines_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1435 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1436
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1437 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1438 with zipfile.ZipFile(f, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1439 for sep, fn in self.arcfiles.items():
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1440 with zipfp.open(fn, "rU") as fp:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1441 ziplines = fp.readlines()
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1442 for line, zipline in zip(self.line_gen, ziplines):
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1443 self.assertEqual(zipline, line + b'\n')
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1444 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1445 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1446
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1447 def iterlines_test(self, f, compression):
a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1448 self.make_test_archive(f, compression)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1449
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1450 # Read the ZIP archive
58004 6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1451 with zipfile.ZipFile(f, "r") as zipfp:
6248b7fdec0d Merged revisions 77136 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55921 diff changeset	1452 for sep, fn in self.arcfiles.items():
65830 719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1453 with zipfp.open(fn, "rU") as fp:
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1454 for line, zipline in zip(self.line_gen, fp):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1455 self.assertEqual(zipline, line + b'\n')
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1456 if not isinstance(f, str):
719ebcb934f3 start banging on zipfile's file leakiness Benjamin Peterson <benjamin@python.org> parents: 65673 diff changeset	1457 f.close()
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1458
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1459 def test_read_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1460 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1461 self.read_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1462
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1463 def test_readline_read_stored(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1464 # Issue #7610: calls to readline() interleaved with calls to read().
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1465 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1466 self.readline_read_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1467
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1468 def test_readline_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1469 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1470 self.readline_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1471
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1472 def test_readlines_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1473 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1474 self.readlines_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1475
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1476 def test_iterlines_stored(self):
41812 50dafa22b8a4 Make test_zipfile pass. Guido van Rossum <guido@python.org> parents: 41642 diff changeset	1477 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1478 self.iterlines_test(f, zipfile.ZIP_STORED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1479
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1480 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1481 def test_read_deflated(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1482 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1483 self.read_test(f, zipfile.ZIP_DEFLATED)
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1484
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1485 @skipUnless(zlib, "requires zlib")
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1486 def test_readline_read_deflated(self):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1487 # Issue #7610: calls to readline() interleaved with calls to read().
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1488 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1489 self.readline_read_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1490
58542 f41d353eb660 Merged revisions 77798 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 58473 diff changeset	1491 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1492 def test_readline_deflated(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1493 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1494 self.readline_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1495
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1496 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1497 def test_readlines_deflated(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1498 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1499 self.readlines_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1500
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1501 @skipUnless(zlib, "requires zlib")
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1502 def test_iterlines_deflated(self):
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1503 for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
55258 a50eb596a6d3 Merged revisions 74011 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55218 diff changeset	1504 self.iterlines_test(f, zipfile.ZIP_DEFLATED)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1505
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1506 def tearDown(self):
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1507 for sep, fn in self.arcfiles.items():
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1508 os.remove(fn)
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1509 unlink(TESTFN)
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1510 unlink(TESTFN2)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1511
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1512
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	1513 def test_main():
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1514 run_unittest(TestsWithSourceFile, TestZip64InSmallFiles, OtherTests,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 40893 diff changeset	1515 PyZipFileTests, DecryptionTests, TestsWithMultipleOpens,
55218 1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1516 TestWithDirectory, UniversalNewlineTests,
1028a991b68e Merged revisions 73931 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 55156 diff changeset	1517 TestsWithRandomBinaryFiles)
33191 edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	1518
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	1519 if __name__ == "__main__":
edb853ed6c78 Port test_zipfile to unittest (patch #736962). Johannes Gijsbers <jlg@dds.nl> parents: 29625 diff changeset	1520 test_main()

Mercurial > cpython-lru_cache-weakref

annotate Lib/test/test_zipfile.py @ 78069:a8aa77458e12 3.2