--- a/mercurial/pycompat.py	Wed Jun 29 19:43:27 2016 -0700
+++ b/mercurial/pycompat.py	Tue Jun 28 16:01:53 2016 +0530
@@ -18,6 +18,13 @@
     pickle.dumps # silence pyflakes
 
 try:
+    import httplib
+    httplib.HTTPException
+except ImportError:
+    import http.client as httplib
+    httplib.HTTPException
+
+try:
     import SocketServer as socketserver
     socketserver.ThreadingMixIn
 except ImportError: