Skip to content

Commit

Permalink
fix: implement closed property on fileio.py classes (#907)
Browse files Browse the repository at this point in the history
* fix: implement closed property on fileio.py classes

* update tests

* fix numerous mistakes
  • Loading branch information
andrewsg committed Dec 6, 2022
1 parent 9998a5e commit 64406ca
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
12 changes: 6 additions & 6 deletions google/cloud/storage/fileio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_fileio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -415,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)
Expand Down Expand Up @@ -767,6 +770,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()

Expand Down Expand Up @@ -913,6 +917,7 @@ def test_close(self):
reader = self._make_blob_reader(blob)

reader.close()
self.assertTrue(reader.closed)

with self.assertRaises(ValueError):
reader.read()
Expand Down

0 comments on commit 64406ca

Please sign in to comment.