diff -r 34b914ac573e -r 33770d2b6cf9 mercurial/pycompat.py
--- a/mercurial/pycompat.py	Mon Jun 27 16:37:37 2016 +0530
+++ b/mercurial/pycompat.py	Mon Jun 27 16:48:54 2016 +0530
@@ -18,6 +18,13 @@
     pickle.dumps # silence pyflakes
 
 try:
+    import SocketServer as socketserver
+    socketserver.ThreadingMixIn
+except ImportError:
+    import socketserver
+    socketserver.ThreadingMixIn
+
+try:
     import xmlrpclib
     xmlrpclib.Transport
 except ImportError: