diff -r 890273343170 -r 28e50c4b15ed mercurial/commandserver.py
--- a/mercurial/commandserver.py	Mon Dec 14 22:21:30 2015 +0000
+++ b/mercurial/commandserver.py	Tue Nov 24 22:58:40 2015 +0900
@@ -5,10 +5,22 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from i18n import _
+from __future__ import absolute_import
+
+import SocketServer
+import errno
+import os
 import struct
-import sys, os, errno, traceback, SocketServer
-import dispatch, encoding, util, error
+import sys
+import traceback
+
+from .i18n import _
+from . import (
+    dispatch,
+    encoding,
+    error,
+    util,
+)
 
 logfile = None