summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2012-09-30 22:04:46 (GMT)
committerNadeem Vawda <nadeem.vawda@gmail.com>2012-09-30 22:04:46 (GMT)
commit26bbdb212d91643129e98777f0df404656577138 (patch)
treeb8b181b6850279f98e02c7e95539496a5f4ccfe0
parent9ec083a3768092e4573a12f8e5d7c400bd2e7b40 (diff)
parentb7a0bfe912f203468e67f0541a365a4cc41a7cb2 (diff)
downloadcpython-26bbdb212d91643129e98777f0df404656577138.zip
cpython-26bbdb212d91643129e98777f0df404656577138.tar.gz
cpython-26bbdb212d91643129e98777f0df404656577138.tar.bz2
Merge: #16304: Further performance improvements for BZ2File.
Optimizations suggested by Serhiy Storchaka.
-rw-r--r--Lib/bz2.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/Lib/bz2.py b/Lib/bz2.py
index fe4118f..37918a8 100644
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -159,15 +159,21 @@ class BZ2File(io.BufferedIOBase):
raise ValueError("I/O operation on closed file")
def _check_can_read(self):
- if not self.readable():
+ if self.closed:
+ raise ValueError("I/O operation on closed file")
+ if self._mode not in (_MODE_READ, _MODE_READ_EOF):
raise io.UnsupportedOperation("File not open for reading")
def _check_can_write(self):
- if not self.writable():
+ if self.closed:
+ raise ValueError("I/O operation on closed file")
+ if self._mode != _MODE_WRITE:
raise io.UnsupportedOperation("File not open for writing")
def _check_can_seek(self):
- if not self.readable():
+ if self.closed:
+ raise ValueError("I/O operation on closed file")
+ if self._mode not in (_MODE_READ, _MODE_READ_EOF):
raise io.UnsupportedOperation("Seeking is only supported "
"on files open for reading")
if not self._fp.seekable():