mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix httplib for removal of slicing from exceptions.

This commit is contained in:
Brett Cannon 2007-02-27 20:16:38 +00:00
parent 5b198e8639
commit 6f8fe151da
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/httplib.py
View File

@ -870,7 +870,7 @@ def request(self, method, url, body=None, headers={}):
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 @@ def _read(self):
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