diff -r d60678a567a9 -r 328739ea70c3 mercurial/url.py
--- a/mercurial/url.py	Tue Jun 23 22:38:21 2015 -0700
+++ b/mercurial/url.py	Tue Jun 23 22:20:08 2015 -0700
@@ -159,7 +159,7 @@
                     sock.connect(sa)
                     return sock
 
-                except socket.error, msg:
+                except socket.error as msg:
                     if sock is not None:
                         sock.close()
 
@@ -411,7 +411,7 @@
         try:
             return urllib2.HTTPDigestAuthHandler.http_error_auth_reqed(
                         self, auth_header, host, req, headers)
-        except ValueError, inst:
+        except ValueError as inst:
             arg = inst.args[0]
             if arg.startswith("AbstractDigestAuthHandler doesn't know "):
                 return