[Python-3000-checkins] r54452 - python/branches/p3yk/Lib/httplib.py

guido.van.rossum python-3000-checkins at python.org
Mon Mar 19 23:26:29 CET 2007


Author: guido.van.rossum
Date: Mon Mar 19 23:26:27 2007
New Revision: 54452

Modified:
   python/branches/p3yk/Lib/httplib.py
Log:
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].


Modified: python/branches/p3yk/Lib/httplib.py
==============================================================================
--- python/branches/p3yk/Lib/httplib.py	(original)
+++ python/branches/p3yk/Lib/httplib.py	Mon Mar 19 23:26:27 2007
@@ -714,7 +714,7 @@
             else:
                 self.sock.sendall(str)
         except socket.error as v:
-            if v[0] == 32:      # Broken pipe
+            if v.args[0] == 32:      # Broken pipe
                 self.close()
             raise
 
@@ -870,7 +870,7 @@
             self._send_request(method, url, body, headers)
         except socket.error as v:
             # 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
             # try one more time
             self._send_request(method, url, body, headers)
@@ -1020,7 +1020,7 @@
             try:
                 buf = self._ssl.read(self._bufsize)
             except socket.sslerror as err:
-                err_type = err.message
+                err_type = err.args[0]
                 if (err_type == socket.SSL_ERROR_WANT_READ
                     or err_type == socket.SSL_ERROR_WANT_WRITE):
                     continue
@@ -1029,7 +1029,7 @@
                     break
                 raise
             except socket.error as err:
-                err_type = err.message
+                err_type = err.args[0]
                 if err_type == errno.EINTR:
                     continue
                 if err_type == errno.EBADF:


More information about the Python-3000-checkins mailing list