[Python-checkins] cpython (3.5): Restored test_interleaved. After issue #8886 it was a duplicate of

serhiy.storchaka python-checkins at python.org
Fri May 13 14:20:08 EDT 2016


https://hg.python.org/cpython/rev/ae50bf6e3ac8
changeset:   101318:ae50bf6e3ac8
branch:      3.5
parent:      101315:63e23b2dedcc
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri May 13 21:18:58 2016 +0300
summary:
  Restored test_interleaved. After issue #8886 it was a duplicate of
test_different_file.

files:
  Lib/test/test_zipfile.py |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -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)
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list