mirror of
https://github.com/python/cpython.git
synced 2025-08-01 15:43:13 +00:00
Issue #21560: An attempt to write a data of wrong type no longer cause
GzipFile corruption. Original patch by Wolfgang Maier.
This commit is contained in:
parent
f6e31b79a8
commit
d4c2ac8394
3 changed files with 38 additions and 2 deletions
|
@ -43,6 +43,14 @@ class BaseTest(unittest.TestCase):
|
|||
|
||||
|
||||
class TestGzip(BaseTest):
|
||||
def write_and_read_back(self, data, mode='b'):
|
||||
b_data = bytes(data)
|
||||
with gzip.GzipFile(self.filename, 'w'+mode) as f:
|
||||
l = f.write(data)
|
||||
self.assertEqual(l, len(b_data))
|
||||
with gzip.GzipFile(self.filename, 'r'+mode) as f:
|
||||
self.assertEqual(f.read(), b_data)
|
||||
|
||||
def test_write(self):
|
||||
with gzip.GzipFile(self.filename, 'wb') as f:
|
||||
f.write(data1 * 50)
|
||||
|
@ -57,6 +65,31 @@ class TestGzip(BaseTest):
|
|||
# Test multiple close() calls.
|
||||
f.close()
|
||||
|
||||
# The following test_write_xy methods test that write accepts
|
||||
# the corresponding bytes-like object type as input
|
||||
# and that the data written equals bytes(xy) in all cases.
|
||||
def test_write_memoryview(self):
|
||||
self.write_and_read_back(memoryview(data1 * 50))
|
||||
m = memoryview(bytes(range(256)))
|
||||
data = m.cast('B', shape=[8,8,4])
|
||||
self.write_and_read_back(data)
|
||||
|
||||
def test_write_bytearray(self):
|
||||
self.write_and_read_back(bytearray(data1 * 50))
|
||||
|
||||
def test_write_incompatible_type(self):
|
||||
# Test that non-bytes-like types raise TypeError.
|
||||
# Issue #21560: attempts to write incompatible types
|
||||
# should not affect the state of the fileobject
|
||||
with gzip.GzipFile(self.filename, 'wb') as f:
|
||||
with self.assertRaises(TypeError):
|
||||
f.write('a')
|
||||
with self.assertRaises(TypeError):
|
||||
f.write([1])
|
||||
f.write(data1)
|
||||
with gzip.GzipFile(self.filename, 'rb') as f:
|
||||
self.assertEqual(f.read(), data1)
|
||||
|
||||
def test_read(self):
|
||||
self.test_write()
|
||||
# Try reading.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue