From 2da57ecff0e9572e45663dbad1c5f520e57c531f Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 11 Aug 2013 11:47:07 +1200 Subject: Correct order of precedence for SSL errors. --- netlib/tcp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'netlib/tcp.py') diff --git a/netlib/tcp.py b/netlib/tcp.py index df1f8fea..f4a8acf9 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -130,8 +130,6 @@ class Reader(_FileLike): data = self.o.read(rlen) except SSL.ZeroReturnError: break - except SSL.Error, v: - raise NetLibSSLError(v.message) except SSL.WantReadError: if (time.time() - start) < self.o.gettimeout(): time.sleep(0.1) @@ -144,6 +142,8 @@ class Reader(_FileLike): raise NetLibDisconnect except SSL.SysCallError: raise NetLibDisconnect + except SSL.Error, v: + raise NetLibSSLError(v.message) self.first_byte_timestamp = self.first_byte_timestamp or time.time() if not data: break -- cgit v1.2.3