From 5e409e1965cf9154566c70432b1141c80bd322f6 Mon Sep 17 00:00:00 2001 From: Andrew Gorcester Date: Tue, 15 Nov 2022 15:46:47 -0800 Subject: [PATCH 1/3] fix: implement closed property on fileio.py classes --- google/cloud/storage/fileio.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/google/cloud/storage/fileio.py b/google/cloud/storage/fileio.py index d09a3c885..639e731ba 100644 --- a/google/cloud/storage/fileio.py +++ b/google/cloud/storage/fileio.py @@ -211,9 +211,9 @@ def seek(self, pos, whence=0): def close(self): self._buffer.close() - def _checkClosed(self): - if self._buffer.closed: - raise ValueError("I/O operation on closed file.") + @property + def closed(self): + return self._buffer.closed def readable(self): return True @@ -431,9 +431,9 @@ def close(self): self._upload_chunks_from_buffer(1) self._buffer.close() - def _checkClosed(self): - if self._buffer.closed: - raise ValueError("I/O operation on closed file.") + @property + def closed(self): + return self._buffer.closed def readable(self): return False From 7a58f3acfddf975bad1377a2df5ede96a2ff9525 Mon Sep 17 00:00:00 2001 From: Andrew Gorcester Date: Tue, 6 Dec 2022 14:47:18 -0800 Subject: [PATCH 2/3] update tests --- tests/unit/test_fileio.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/unit/test_fileio.py b/tests/unit/test_fileio.py index 54e113e55..f1af8b5e3 100644 --- a/tests/unit/test_fileio.py +++ b/tests/unit/test_fileio.py @@ -287,6 +287,7 @@ def test_close(self): reader = self._make_blob_reader(blob) reader.close() + self.assertTrue(reader.closed) with self.assertRaises(ValueError): reader.read() @@ -767,6 +768,7 @@ def test_seek(self): def test_close(self): buff = self._make_sliding_buffer() buff.close() + self.assertTrue(buff.closed()) with self.assertRaises(ValueError): buff.read() @@ -913,6 +915,7 @@ def test_close(self): reader = self._make_blob_reader(blob) reader.close() + self.assertRaises(self.closed) with self.assertRaises(ValueError): reader.read() From a9e6bcfd604404857270557e6f6896183c2258f8 Mon Sep 17 00:00:00 2001 From: Andrew Gorcester Date: Tue, 6 Dec 2022 15:05:15 -0800 Subject: [PATCH 3/3] fix numerous mistakes --- tests/unit/test_fileio.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_fileio.py b/tests/unit/test_fileio.py index f1af8b5e3..dab272a90 100644 --- a/tests/unit/test_fileio.py +++ b/tests/unit/test_fileio.py @@ -416,6 +416,8 @@ def test_close_errors(self): writer.close() # Close a second time to verify it successfully does nothing. writer.close() + + self.assertTrue(writer.closed) # Try to write to closed file. with self.assertRaises(ValueError): writer.write(TEST_BINARY_DATA) @@ -768,7 +770,7 @@ def test_seek(self): def test_close(self): buff = self._make_sliding_buffer() buff.close() - self.assertTrue(buff.closed()) + self.assertTrue(buff.closed) with self.assertRaises(ValueError): buff.read() @@ -915,7 +917,7 @@ def test_close(self): reader = self._make_blob_reader(blob) reader.close() - self.assertRaises(self.closed) + self.assertTrue(reader.closed) with self.assertRaises(ValueError): reader.read()