From eb70be2b46e12ab81a80342906f63ee9c9b6ea3d Mon Sep 17 00:00:00 2001 From: Nadeem Vawda Date: Mon, 1 Oct 2012 23:05:32 +0200 Subject: Issue #16304: Further optimize BZ2File.readlines?(). --- Lib/bz2.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Lib/bz2.py b/Lib/bz2.py index da19e27..c307507 100644 --- a/Lib/bz2.py +++ b/Lib/bz2.py @@ -319,9 +319,10 @@ class BZ2File(io.BufferedIOBase): non-negative, no more than size bytes will be read (in which case the line may be incomplete). Returns b'' if already at EOF. """ - if not hasattr(size, "__index__"): - raise TypeError("Integer argument expected") - size = size.__index__() + if not isinstance(size, int): + if not hasattr(size, "__index__"): + raise TypeError("Integer argument expected") + size = size.__index__() with self._lock: self._check_can_read() # Shortcut for the common case - the whole line is in the buffer. @@ -341,9 +342,10 @@ class BZ2File(io.BufferedIOBase): further lines will be read once the total size of the lines read so far equals or exceeds size. """ - if not hasattr(size, "__index__"): - raise TypeError("Integer argument expected") - size = size.__index__() + if not isinstance(size, int): + if not hasattr(size, "__index__"): + raise TypeError("Integer argument expected") + size = size.__index__() with self._lock: return io.BufferedIOBase.readlines(self, size) -- cgit v0.12