mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make test_socket_ssl.py pass by fixing some code that was

Browse source 
incorrectly assuming that err.message was the Py3k way of
writing err[0] in 2.x.  The correct spelling is err.args[0].
This commit is contained in:
Guido van Rossum 2007-03-19 22:26:27 +00:00
parent 7cba8508af
commit 89df245607
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/httplib.py
View file

@ -714,7 +714,7 @@ class HTTPConnection:
else: else:
self.sock.sendall(str) self.sock.sendall(str)
except socket.error as v: except socket.error as v:
if v[0] == 32: # Broken pipe if v.args[0] == 32: # Broken pipe
self.close() self.close()
raise raise
@ -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.message != 32 or not self.auto_open: if v.args[0] != 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,7 +1020,7 @@ 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:
err_type = err.message err_type = err.args[0]
if (err_type == socket.SSL_ERROR_WANT_READ if (err_type == socket.SSL_ERROR_WANT_READ
or err_type == socket.SSL_ERROR_WANT_WRITE): or err_type == socket.SSL_ERROR_WANT_WRITE):
continue continue
@ -1029,7 +1029,7 @@ class SSLFile(SharedSocketClient):
break break
raise raise
except socket.error as err: except socket.error as err:
err_type = err.message err_type = err.args[0]
if err_type == errno.EINTR: if err_type == errno.EINTR:
continue continue
if err_type == errno.EBADF: if err_type == errno.EBADF: