--- a/mercurial/httpclient/socketutil.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/mercurial/httpclient/socketutil.py	Tue Jun 23 22:20:08 2015 -0700
@@ -64,7 +64,7 @@
                 sock = socket.socket(af, socktype, proto)
                 logger.info("connect: (%s, %s)", host, port)
                 sock.connect(sa)
-            except socket.error, msg:
+            except socket.error as msg:
                 logger.info('connect fail: %s %s', host, port)
                 if sock:
                     sock.close()
@@ -100,7 +100,7 @@
             while True:
                 try:
                     return self._ssl.read(buflen)
-                except socket.sslerror, x:
+                except socket.sslerror as x:
                     if x.args[0] == socket.SSL_ERROR_WANT_READ:
                         continue
                     else: