(original) (raw)

changeset: 101318:ae50bf6e3ac8 branch: 3.5 parent: 101315:63e23b2dedcc user: Serhiy Storchaka storchaka@gmail.com date: Fri May 13 21🔞58 2016 +0300 files: Lib/test/test_zipfile.py description: Restored test_interleaved. After issue #8886 it was a duplicate of test_different_file. diff -r 63e23b2dedcc -r ae50bf6e3ac8 Lib/test/test_zipfile.py --- a/Lib/test/test_zipfile.py Fri May 13 01:32:42 2016 -0700 +++ b/Lib/test/test_zipfile.py Fri May 13 21🔞58 2016 +0300 @@ -1809,11 +1809,12 @@ for f in get_files(self): self.make_test_archive(f) with zipfile.ZipFile(f, mode="r") as zipf: - with zipf.open('ones') as zopen1, zipf.open('twos') as zopen2: + with zipf.open('ones') as zopen1: data1 = zopen1.read(500) - data2 = zopen2.read(500) - data1 += zopen1.read() - data2 += zopen2.read() + with zipf.open('twos') as zopen2: + data2 = zopen2.read(500) + data1 += zopen1.read() + data2 += zopen2.read() self.assertEqual(data1, self.data1) self.assertEqual(data2, self.data2) /storchaka@gmail.com