Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 89df245

Browse files
committed
Make test_socket_ssl.py pass by fixing some code that was
incorrectly assuming that err.message was the Py3k way of writing err[0] in 2.x. The correct spelling is err.args[0].
1 parent 7cba850 commit 89df245

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Lib/httplib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ def send(self, str):
714714
else:
715715
self.sock.sendall(str)
716716
except socket.error as v:
717-
if v[0] == 32: # Broken pipe
717+
if v.args[0] == 32: # Broken pipe
718718
self.close()
719719
raise
720720

@@ -870,7 +870,7 @@ def request(self, method, url, body=None, headers={}):
870870
self._send_request(method, url, body, headers)
871871
except socket.error as v:
872872
# trap 'Broken pipe' if we're allowed to automatically reconnect
873-
if v.message != 32 or not self.auto_open:
873+
if v.args[0] != 32 or not self.auto_open:
874874
raise
875875
# try one more time
876876
self._send_request(method, url, body, headers)
@@ -1020,7 +1020,7 @@ def _read(self):
10201020
try:
10211021
buf = self._ssl.read(self._bufsize)
10221022
except socket.sslerror as err:
1023-
err_type = err.message
1023+
err_type = err.args[0]
10241024
if (err_type == socket.SSL_ERROR_WANT_READ
10251025
or err_type == socket.SSL_ERROR_WANT_WRITE):
10261026
continue
@@ -1029,7 +1029,7 @@ def _read(self):
10291029
break
10301030
raise
10311031
except socket.error as err:
1032-
err_type = err.message
1032+
err_type = err.args[0]
10331033
if err_type == errno.EINTR:
10341034
continue
10351035
if err_type == errno.EBADF:

0 commit comments

Comments
 (0)