mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
[3.14] gh-137589: Zipfile tests: close file objects (GH-138080) (#139766)
gh-137589: Zipfile tests: close file objects (GH-138080)
Zipfile tests: close file objects
(cherry picked from commit 5cea843594)
Co-authored-by: Rogdham <3994389+Rogdham@users.noreply.github.com>
This commit is contained in:
parent
7e23d36770
commit
d729fcf6e3
2 changed files with 26 additions and 19 deletions
|
|
@ -312,26 +312,26 @@ def test_low_compression(self):
|
|||
self.assertEqual(openobj.read(1), b'2')
|
||||
|
||||
def test_writestr_compression(self):
|
||||
zipfp = zipfile.ZipFile(TESTFN2, "w")
|
||||
zipfp.writestr("b.txt", "hello world", compress_type=self.compression)
|
||||
info = zipfp.getinfo('b.txt')
|
||||
self.assertEqual(info.compress_type, self.compression)
|
||||
with zipfile.ZipFile(TESTFN2, "w") as zipfp:
|
||||
zipfp.writestr("b.txt", "hello world", compress_type=self.compression)
|
||||
info = zipfp.getinfo('b.txt')
|
||||
self.assertEqual(info.compress_type, self.compression)
|
||||
|
||||
def test_writestr_compresslevel(self):
|
||||
zipfp = zipfile.ZipFile(TESTFN2, "w", compresslevel=1)
|
||||
zipfp.writestr("a.txt", "hello world", compress_type=self.compression)
|
||||
zipfp.writestr("b.txt", "hello world", compress_type=self.compression,
|
||||
compresslevel=2)
|
||||
with zipfile.ZipFile(TESTFN2, "w", compresslevel=1) as zipfp:
|
||||
zipfp.writestr("a.txt", "hello world", compress_type=self.compression)
|
||||
zipfp.writestr("b.txt", "hello world", compress_type=self.compression,
|
||||
compresslevel=2)
|
||||
|
||||
# Compression level follows the constructor.
|
||||
a_info = zipfp.getinfo('a.txt')
|
||||
self.assertEqual(a_info.compress_type, self.compression)
|
||||
self.assertEqual(a_info.compress_level, 1)
|
||||
# Compression level follows the constructor.
|
||||
a_info = zipfp.getinfo('a.txt')
|
||||
self.assertEqual(a_info.compress_type, self.compression)
|
||||
self.assertEqual(a_info.compress_level, 1)
|
||||
|
||||
# Compression level is overridden.
|
||||
b_info = zipfp.getinfo('b.txt')
|
||||
self.assertEqual(b_info.compress_type, self.compression)
|
||||
self.assertEqual(b_info._compresslevel, 2)
|
||||
# Compression level is overridden.
|
||||
b_info = zipfp.getinfo('b.txt')
|
||||
self.assertEqual(b_info.compress_type, self.compression)
|
||||
self.assertEqual(b_info._compresslevel, 2)
|
||||
|
||||
def test_read_return_size(self):
|
||||
# Issue #9837: ZipExtFile.read() shouldn't return more bytes
|
||||
|
|
@ -2330,6 +2330,7 @@ def test_empty_zipfile(self):
|
|||
zipf = zipfile.ZipFile(TESTFN, mode="r")
|
||||
except zipfile.BadZipFile:
|
||||
self.fail("Unable to create empty ZIP file in 'w' mode")
|
||||
zipf.close()
|
||||
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="a")
|
||||
zipf.close()
|
||||
|
|
@ -2337,6 +2338,7 @@ def test_empty_zipfile(self):
|
|||
zipf = zipfile.ZipFile(TESTFN, mode="r")
|
||||
except:
|
||||
self.fail("Unable to create empty ZIP file in 'a' mode")
|
||||
zipf.close()
|
||||
|
||||
def test_open_empty_file(self):
|
||||
# Issue 1710703: Check that opening a file with less than 22 bytes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue