From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 14 Oct 2009 19:04:48 +0000 (+0000)
Subject: Fix py3k warnings in httplib
X-Git-Tag: v2.7a1~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92331d5e1be51aa990836dd8f0c43b33e8802a7d;p=python

Fix py3k warnings in httplib
---

diff --git a/Lib/httplib.py b/Lib/httplib.py
index a83245bb93..3f44f12844 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -706,8 +706,8 @@ class HTTPConnection:
 
         if code != 200:
             self.close()
-            raise socket.error, "Tunnel connection failed: %d %s" % (code,
-                                                                     message.strip())
+            raise socket.error("Tunnel connection failed: %d %s" % (code,
+                                                                    message.strip()))
         while True:
             line = response.fp.readline()
             if line == '\r\n': break
@@ -757,7 +757,7 @@ class HTTPConnection:
             else:
                 self.sock.sendall(str)
         except socket.error, v:
-            if v[0] == 32:      # Broken pipe
+            if v.args[0] == 32:      # Broken pipe
                 self.close()
             raise
 
@@ -929,7 +929,7 @@ class HTTPConnection:
             self._send_request(method, url, body, headers)
         except socket.error, v:
             # trap 'Broken pipe' if we're allowed to automatically reconnect
-            if v[0] != 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)