Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pycompat.py @ 29433:33770d2b6cf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: conditionalize SocketServer import The SocketServer is renamed to socketserver in python 3
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 27 Jun 2016 16:48:54 +0530
parents 34b914ac573e
children 0c741fd6158a
line wrap: on
line diff
--- 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: