[PATCH 2 of 2] commands: use absolute_import
Gregory Szorc
gregory.szorc at gmail.com
Tue Mar 1 17:10:27 EST 2016
# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1450765591 28800
# Mon Dec 21 22:26:31 2015 -0800
# Node ID 128cce2aa42ab724ee115eba541f19a25cd043ea
# Parent 4adf897a5f0bdc1ce302cafaada352c86c4e74f2
commands: use absolute_import
All mercurial.* modules are now using absolute_import \o/
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4,27 +4,77 @@
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-from node import hex, bin, nullhex, nullid, nullrev, short
-from lock import release
-from i18n import _
-import os, re, difflib, time, tempfile, errno, shlex
-import sys, socket
-import hg, scmutil, util, revlog, copies, error, bookmarks
-import patch, help, encoding, templatekw, discovery
-import archival, changegroup, cmdutil, hbisect
-import sshserver, hgweb
-import extensions
-import merge as mergemod
-import minirst, revset, fileset
-import dagparser, context, simplemerge, graphmod, copies
-import random, operator
-import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
-import phases, obsolete, exchange, bundle2, repair, lock as lockmod
-import ui as uimod
-import streamclone
-import commandserver
+from __future__ import absolute_import
+
+import difflib
+import errno
+import operator
+import os
+import random
+import re
+import shlex
+import socket
+import sys
+import tempfile
+import time
+
+from .i18n import _
+from .node import (
+ bin,
+ hex,
+ nullhex,
+ nullid,
+ nullrev,
+ short,
+)
+from . import (
+ archival,
+ bookmarks,
+ bundle2,
+ changegroup,
+ cmdutil,
+ commandserver,
+ context,
+ copies,
+ dagparser,
+ dagutil,
+ destutil,
+ discovery,
+ encoding,
+ error,
+ exchange,
+ extensions,
+ fileset,
+ graphmod,
+ hbisect,
+ help,
+ hg,
+ hgweb,
+ localrepo,
+ lock as lockmod,
+ merge as mergemod,
+ minirst,
+ obsolete,
+ patch,
+ phases,
+ pvec,
+ repair,
+ revlog,
+ revset,
+ scmutil,
+ setdiscovery,
+ simplemerge,
+ sshserver,
+ streamclone,
+ templatekw,
+ treediscovery,
+ ui as uimod,
+ util,
+)
+
+release = lockmod.release
table = {}
command = cmdutil.command(table)
@@ -2676,18 +2726,23 @@ def debuginstall(ui):
# compiled modules
ui.status(_("checking installed modules (%s)...\n")
% os.path.dirname(__file__))
try:
- import bdiff, mpatch, base85, osutil
+ from . import (
+ base85,
+ bdiff,
+ mpatch,
+ osutil,
+ )
dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
except Exception as inst:
ui.write(" %s\n" % inst)
ui.write(_(" One or more extensions could not be found"))
ui.write(_(" (check that you compiled the extensions)\n"))
problems += 1
# templates
- import templater
+ from . import templater
p = templater.templatepaths()
ui.status(_("checking templates (%s)...\n") % ' '.join(p))
if p:
m = templater.templatepath("map-cmdline.default")
diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -87,9 +87,8 @@
hgext/win32mbcs.py not using absolute_import
hgext/win32text.py not using absolute_import
i18n/check-translation.py not using absolute_import
i18n/polib.py not using absolute_import
- mercurial/commands.py not using absolute_import
setup.py not using absolute_import
tests/filterpyflakes.py requires print_function
tests/generate-working-copy-states.py requires print_function
tests/get-with-headers.py requires print_function
More information about the Mercurial-devel
mailing list