From a5ba696ed8aa3efbc709de4046a121a82a31392f Mon Sep 17 00:00:00 2001 From: Andy McCurdy Date: Fri, 2 Aug 2019 15:13:04 -0700 Subject: version 3.3.5, handle socket.timeout errors correctly in Python 2.7 Fix an issue where socket.timeout errors could be handled by the wrong exception handler in Python 2.7. --- redis/connection.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'redis/connection.py') diff --git a/redis/connection.py b/redis/connection.py index 28b579e..151d4d0 100755 --- a/redis/connection.py +++ b/redis/connection.py @@ -187,14 +187,10 @@ class SocketBuffer(object): # blocking error, simply return False indicating that # there's no data to be read. otherwise raise the # original exception. - allowed_errno = NONBLOCKING_EXCEPTION_ERROR_NUMBERS[ex.__class__] - if raise_on_timeout or ex.errno != allowed_errno: - raise - return False - except socket.timeout: - if raise_on_timeout: - raise - return False + allowed = NONBLOCKING_EXCEPTION_ERROR_NUMBERS.get(ex.__class__, -1) + if not raise_on_timeout and ex.errno == allowed: + return False + raise finally: if custom_timeout: sock.settimeout(self.socket_timeout) @@ -417,14 +413,10 @@ class HiredisParser(BaseParser): # blocking error, simply return False indicating that # there's no data to be read. otherwise raise the # original exception. - allowed_errno = NONBLOCKING_EXCEPTION_ERROR_NUMBERS[ex.__class__] - if raise_on_timeout or ex.errno != allowed_errno: - raise - return False - except socket.timeout: - if not raise_on_timeout: - raise - return False + allowed = NONBLOCKING_EXCEPTION_ERROR_NUMBERS.get(ex.__class__, -1) + if not raise_on_timeout and ex.errno == allowed: + return False + raise finally: if custom_timeout: sock.settimeout(self._socket_timeout) -- cgit v1.2.1