changeset 27351:28e50c4b15ed

commandserver: use absolute_import
author Yuya Nishihara <yuya@tcha.org>
date Tue, 24 Nov 2015 22:58:40 +0900
parents 890273343170
children 9fd8f1552369
files mercurial/commandserver.py tests/test-check-py3-compat.t
diffstat 2 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- a/tests/test-check-py3-compat.t	Mon Dec 14 22:21:30 2015 +0000
+++ b/tests/test-check-py3-compat.t	Tue Nov 24 22:58:40 2015 +0900
@@ -101,7 +101,6 @@
   mercurial/byterange.py not using absolute_import
   mercurial/cmdutil.py not using absolute_import
   mercurial/commands.py not using absolute_import
-  mercurial/commandserver.py not using absolute_import
   mercurial/context.py not using absolute_import
   mercurial/dirstate.py not using absolute_import
   mercurial/dispatch.py requires print_function