Commit 6f8fe151 authored by Brett Cannon's avatar Brett Cannon

Fix httplib for removal of slicing from exceptions.

parent 5b198e86
...@@ -870,7 +870,7 @@ class HTTPConnection: ...@@ -870,7 +870,7 @@ class HTTPConnection:
self._send_request(method, url, body, headers) self._send_request(method, url, body, headers)
except socket.error as v: except socket.error as v:
# trap 'Broken pipe' if we're allowed to automatically reconnect # trap 'Broken pipe' if we're allowed to automatically reconnect
if v[0] != 32 or not self.auto_open: if v.message != 32 or not self.auto_open:
raise raise
# try one more time # try one more time
self._send_request(method, url, body, headers) self._send_request(method, url, body, headers)
...@@ -1020,17 +1020,19 @@ class SSLFile(SharedSocketClient): ...@@ -1020,17 +1020,19 @@ class SSLFile(SharedSocketClient):
try: try:
buf = self._ssl.read(self._bufsize) buf = self._ssl.read(self._bufsize)
except socket.sslerror as err: except socket.sslerror as err:
if (err[0] == socket.SSL_ERROR_WANT_READ err_type = err.message
or err[0] == socket.SSL_ERROR_WANT_WRITE): if (err_type == socket.SSL_ERROR_WANT_READ
or err_type == socket.SSL_ERROR_WANT_WRITE):
continue continue
if (err[0] == socket.SSL_ERROR_ZERO_RETURN if (err_type == socket.SSL_ERROR_ZERO_RETURN
or err[0] == socket.SSL_ERROR_EOF): or err_type == socket.SSL_ERROR_EOF):
break break
raise raise
except socket.error as err: except socket.error as err:
if err[0] == errno.EINTR: err_type = err.message
if err_type == errno.EINTR:
continue continue
if err[0] == errno.EBADF: if err_type == errno.EBADF:
# XXX socket was closed? # XXX socket was closed?
break break
raise raise
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment