mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge: #16304: Optimizations for BZ2File, and minor bugfix.

Browse source
This commit is contained in:
Nadeem Vawda 2012-10-01 23:11:35 +02:00
commit 40ee157458
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/bz2.py
View file

@ -159,21 +159,18 @@ class BZ2File(io.BufferedIOBase):
raise ValueError("I/O operation on closed file") raise ValueError("I/O operation on closed file")
def _check_can_read(self): def _check_can_read(self):
if self.closed:
raise ValueError("I/O operation on closed file")
if self._mode not in (_MODE_READ, _MODE_READ_EOF): if self._mode not in (_MODE_READ, _MODE_READ_EOF):
self._check_not_closed()
raise io.UnsupportedOperation("File not open for reading") raise io.UnsupportedOperation("File not open for reading")
def _check_can_write(self): def _check_can_write(self):
if self.closed:
raise ValueError("I/O operation on closed file")
if self._mode != _MODE_WRITE: if self._mode != _MODE_WRITE:
self._check_not_closed()
raise io.UnsupportedOperation("File not open for writing") raise io.UnsupportedOperation("File not open for writing")
def _check_can_seek(self): def _check_can_seek(self):
if self.closed:
raise ValueError("I/O operation on closed file")
if self._mode not in (_MODE_READ, _MODE_READ_EOF): if self._mode not in (_MODE_READ, _MODE_READ_EOF):
self._check_not_closed()
raise io.UnsupportedOperation("Seeking is only supported " raise io.UnsupportedOperation("Seeking is only supported "
"on files open for reading") "on files open for reading")
if not self._fp.seekable(): if not self._fp.seekable():
@ -322,10 +319,12 @@ class BZ2File(io.BufferedIOBase):
non-negative, no more than size bytes will be read (in which non-negative, no more than size bytes will be read (in which
case the line may be incomplete). Returns b'' if already at EOF. case the line may be incomplete). Returns b'' if already at EOF.
""" """
if not hasattr(size, "__index__"): if not isinstance(size, int):
raise TypeError("Integer argument expected") if not hasattr(size, "__index__"):
size = size.__index__() raise TypeError("Integer argument expected")
size = size.__index__()
with self._lock: with self._lock:
self._check_can_read()
# Shortcut for the common case - the whole line is in the buffer. # Shortcut for the common case - the whole line is in the buffer.
if size < 0: if size < 0:
end = self._buffer.find(b"\n", self._buffer_offset) + 1 end = self._buffer.find(b"\n", self._buffer_offset) + 1
@ -343,9 +342,10 @@ class BZ2File(io.BufferedIOBase):
further lines will be read once the total size of the lines read further lines will be read once the total size of the lines read
so far equals or exceeds size. so far equals or exceeds size.
""" """
if not hasattr(size, "__index__"): if not isinstance(size, int):
raise TypeError("Integer argument expected") if not hasattr(size, "__index__"):
size = size.__index__() raise TypeError("Integer argument expected")
size = size.__index__()
with self._lock: with self._lock:
return io.BufferedIOBase.readlines(self, size) return io.BufferedIOBase.readlines(self, size)