SysCallError is treated as SSLError exception

Author: csotoa

HISTORY.rst

@@ -3,7 +3,12 @@
 Release History
 ---------------
 
-2.4.3.2 (2014-10-24) Rebelmouse
+2.4.3.2 (2014-11-06) Rebelmouse
++++++++++++++++++++++++++++++++
+- SysCallError is handled as SSLError exception
+
+
+2.4.3.2 (2014-10-4) Rebelmouse
 +++++++++++++++++++++++++++++++
 
 - Raise a requests' exception when occurs  104 - Connection reset by peer

requests/__init__.py

@@ -42,7 +42,7 @@
 """
 
 __title__ = 'requests'
-__version__ = '2.4.3.2'
+__version__ = '2.4.3.3'
 __build__ = 0x020403
 __author__ = 'Kenneth Reitz'
 __license__ = 'Apache 2.0'

requests/packages/urllib3/connectionpool.py

@@ -6,6 +6,8 @@
 from socket import error as SocketError, timeout as SocketTimeout
 import socket
 
+import OpenSSL.SSL
+
 try:  # Python 3
     from queue import LifoQueue, Empty, Full
 except ImportError:
@@ -536,7 +538,7 @@ def urlopen(self, method, url, body=None, headers=None, retries=None,
             # Timed out by queue.
             raise EmptyPoolError(self, "No pool connections are available.")
 
-        except (BaseSSLError, CertificateError) as e:
+        except (BaseSSLError, CertificateError, OpenSSL.SSL.SysCallError) as e:
             # Release connection unconditionally because there is no way to
             # close it externally in case of exception.
             release_conn = True

requests/packages/urllib3/contrib/pyopenssl.py

@@ -62,7 +62,6 @@
 from .. import connection
 from .. import util
 
-from requests import exceptions
 
 __all__ = ['inject_into_urllib3', 'extract_from_urllib3']
 
@@ -188,8 +187,6 @@ def recv(self, *args, **kwargs):
         except OpenSSL.SSL.SysCallError as e:
             if self.suppress_ragged_eofs and e.args == (-1, 'Unexpected EOF'):
                 return b''
-            elif e.args == (104, 'Connection reset by peer'):
-                raise exceptions.SSLError('104 Connection reset by peer')
             else:
                 raise
         except OpenSSL.SSL.ZeroReturnError: