[PATCH 1 of 8] py3: move up symbol imports to enforce import-checker rules
Yuya Nishihara
yuya at tcha.org
Sat May 14 07:33:46 UTC 2016
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1463202192 -32400
# Sat May 14 14:03:12 2016 +0900
# Node ID c6077c18cb48e59dcbf51489f21cb1795dfdd0a7
# Parent 983874e22594cebf97f24f7c4d2d28480a90a54f
py3: move up symbol imports to enforce import-checker rules
Since (b) is banned, we should do the same for (a) for consistency.
a) from mercurial import hg
from mercurial.i18n import _
b) from . import hg
from .i18n import _
diff --git a/contrib/synthrepo.py b/contrib/synthrepo.py
--- a/contrib/synthrepo.py
+++ b/contrib/synthrepo.py
@@ -45,6 +45,13 @@ import os
import random
import sys
import time
+
+from mercurial.i18n import _
+from mercurial.node import (
+ nullid,
+ nullrev,
+ short,
+)
from mercurial import (
cmdutil,
context,
@@ -54,12 +61,6 @@ from mercurial import (
scmutil,
util,
)
-from mercurial.i18n import _
-from mercurial.node import (
- nullid,
- nullrev,
- short,
-)
# Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/hgext/automv.py b/hgext/automv.py
--- a/hgext/automv.py
+++ b/hgext/automv.py
@@ -26,6 +26,7 @@ The threshold at which a file is conside
from __future__ import absolute_import
+from mercurial.i18n import _
from mercurial import (
commands,
copies,
@@ -34,7 +35,6 @@ from mercurial import (
scmutil,
similar
)
-from mercurial.i18n import _
def extsetup(ui):
entry = extensions.wrapcommand(
diff --git a/hgext/color.py b/hgext/color.py
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -156,6 +156,8 @@ If ``pagermode`` is not defined, the ``m
from __future__ import absolute_import
import os
+
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
@@ -165,7 +167,6 @@ from mercurial import (
ui as uimod,
util,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -9,11 +9,11 @@
from __future__ import absolute_import
+from mercurial.i18n import _
from mercurial import (
cmdutil,
registrar,
)
-from mercurial.i18n import _
from . import (
convcmd,
diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -10,11 +10,12 @@
from __future__ import absolute_import
import os
+
+from mercurial.i18n import _
from mercurial import (
demandimport,
error
)
-from mercurial.i18n import _
from . import common
# these do not work with demandimport, blacklist
diff --git a/hgext/convert/common.py b/hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -14,12 +14,12 @@ import os
import re
import subprocess
+from mercurial.i18n import _
from mercurial import (
error,
phases,
util,
)
-from mercurial.i18n import _
propertycache = util.propertycache
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -10,13 +10,13 @@ import os
import shlex
import shutil
+from mercurial.i18n import _
from mercurial import (
encoding,
error,
hg,
util,
)
-from mercurial.i18n import _
from . import (
bzr,
diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -11,12 +11,12 @@ import os
import re
import socket
+from mercurial.i18n import _
from mercurial import (
encoding,
error,
util,
)
-from mercurial.i18n import _
from . import (
common,
diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -10,11 +10,11 @@ import cPickle as pickle
import os
import re
+from mercurial.i18n import _
from mercurial import (
hook,
util,
)
-from mercurial.i18n import _
class logentry(object):
'''Class logentry has the following attributes:
diff --git a/hgext/convert/filemap.py b/hgext/convert/filemap.py
--- a/hgext/convert/filemap.py
+++ b/hgext/convert/filemap.py
@@ -7,10 +7,11 @@ from __future__ import absolute_import
import posixpath
import shlex
+
+from mercurial.i18n import _
from mercurial import (
error,
)
-from mercurial.i18n import _
from . import common
SKIPREV = common.SKIPREV
diff --git a/hgext/convert/git.py b/hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -7,12 +7,13 @@
from __future__ import absolute_import
import os
+
+from mercurial.i18n import _
from mercurial import (
config,
error,
node as nodemod,
)
-from mercurial.i18n import _
from . import (
common,
diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -12,12 +12,13 @@ import os
import shutil
import stat
import tempfile
+
+from mercurial.i18n import _
from mercurial import (
encoding,
error,
util,
)
-from mercurial.i18n import _
from . import common
class gnuarch_source(common.converter_source, common.commandline):
diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -22,6 +22,7 @@ import os
import re
import time
+from mercurial.i18n import _
from mercurial import (
bookmarks,
context,
@@ -37,7 +38,6 @@ from mercurial import (
)
stringio = util.stringio
-from mercurial.i18n import _
from . import common
mapfile = common.mapfile
NoRepo = common.NoRepo
diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -10,11 +10,11 @@ from __future__ import absolute_import
import os
import re
+from mercurial.i18n import _
from mercurial import (
error,
util,
)
-from mercurial.i18n import _
from . import common
diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
--- a/hgext/convert/p4.py
+++ b/hgext/convert/p4.py
@@ -9,11 +9,11 @@ from __future__ import absolute_import
import marshal
import re
+from mercurial.i18n import _
from mercurial import (
error,
util,
)
-from mercurial.i18n import _
from . import common
diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -10,6 +10,7 @@ import sys
import tempfile
import xml.dom.minidom
+from mercurial.i18n import _
from mercurial import (
encoding,
error,
@@ -17,7 +18,6 @@ from mercurial import (
strutil,
util,
)
-from mercurial.i18n import _
from . import common
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -95,6 +95,7 @@ import os
import stat
import sys
+from mercurial.i18n import _
from mercurial import (
context,
extensions,
@@ -105,7 +106,6 @@ from mercurial import (
util,
)
from mercurial import match as matchmod
-from mercurial.i18n import _
from . import (
state,
diff --git a/hgext/fsmonitor/state.py b/hgext/fsmonitor/state.py
--- a/hgext/fsmonitor/state.py
+++ b/hgext/fsmonitor/state.py
@@ -12,8 +12,8 @@ import os
import socket
import struct
+from mercurial.i18n import _
from mercurial import pathutil
-from mercurial.i18n import _
_version = 4
_versionformat = ">I"
diff --git a/hgext/gpg.py b/hgext/gpg.py
--- a/hgext/gpg.py
+++ b/hgext/gpg.py
@@ -10,6 +10,8 @@ from __future__ import absolute_import
import binascii
import os
import tempfile
+
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
@@ -18,7 +20,6 @@ from mercurial import (
node as hgnode,
util,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/hgk.py b/hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -37,6 +37,13 @@ vdiff on hovered and selected revisions.
from __future__ import absolute_import
import os
+
+from mercurial.i18n import _
+from mercurial.node import (
+ nullid,
+ nullrev,
+ short,
+)
from mercurial import (
cmdutil,
commands,
@@ -44,12 +51,6 @@ from mercurial import (
patch,
scmutil,
)
-from mercurial.node import (
- nullid,
- nullrev,
- short,
-)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -175,6 +175,8 @@ import errno
import os
import pickle
import sys
+
+from mercurial.i18n import _
from mercurial import (
bundle2,
cmdutil,
@@ -194,7 +196,6 @@ from mercurial import (
scmutil,
util,
)
-from mercurial.i18n import _
release = lock.release
cmdtable = {}
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -89,8 +89,8 @@ import os
import re
import tempfile
+from mercurial.i18n import _
from mercurial.hgweb import webcommands
-from mercurial.i18n import _
from mercurial import (
cmdutil,
diff --git a/hgext/notify.py b/hgext/notify.py
--- a/hgext/notify.py
+++ b/hgext/notify.py
@@ -139,6 +139,7 @@ import fnmatch
import socket
import time
+from mercurial.i18n import _
from mercurial import (
cmdutil,
error,
@@ -146,7 +147,6 @@ from mercurial import (
patch,
util,
)
-from mercurial.i18n import _
# Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/hgext/pager.py b/hgext/pager.py
--- a/hgext/pager.py
+++ b/hgext/pager.py
@@ -66,6 +66,7 @@ import signal
import subprocess
import sys
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
@@ -73,7 +74,6 @@ from mercurial import (
extensions,
util,
)
-from mercurial.i18n import _
# Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py
--- a/hgext/patchbomb.py
+++ b/hgext/patchbomb.py
@@ -71,6 +71,7 @@ import os
import socket
import tempfile
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
@@ -83,7 +84,6 @@ from mercurial import (
util,
)
stringio = util.stringio
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -27,6 +27,7 @@ from __future__ import absolute_import
import os
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
@@ -34,7 +35,6 @@ from mercurial import (
scmutil,
util,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -18,6 +18,14 @@ from __future__ import absolute_import
import errno
import os
+
+from mercurial.i18n import _
+from mercurial.node import (
+ hex,
+ nullid,
+ nullrev,
+ short,
+)
from mercurial import (
bookmarks,
cmdutil,
@@ -39,13 +47,6 @@ from mercurial import (
scmutil,
util,
)
-from mercurial.node import (
- hex,
- nullid,
- nullrev,
- short,
-)
-from mercurial.i18n import _
release = lock.release
templateopts = commands.templateopts
diff --git a/hgext/record.py b/hgext/record.py
--- a/hgext/record.py
+++ b/hgext/record.py
@@ -12,13 +12,13 @@ The feature provided by this extension h
from __future__ import absolute_import
+from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
error,
extensions,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/relink.py b/hgext/relink.py
--- a/hgext/relink.py
+++ b/hgext/relink.py
@@ -11,13 +11,13 @@ from __future__ import absolute_import
import os
import stat
+from mercurial.i18n import _
from mercurial import (
cmdutil,
error,
hg,
util,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/schemes.py b/hgext/schemes.py
--- a/hgext/schemes.py
+++ b/hgext/schemes.py
@@ -43,6 +43,8 @@ from __future__ import absolute_import
import os
import re
+
+from mercurial.i18n import _
from mercurial import (
cmdutil,
error,
@@ -51,7 +53,6 @@ from mercurial import (
templater,
util,
)
-from mercurial.i18n import _
cmdtable = {}
command = cmdutil.command(cmdtable)
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -25,6 +25,8 @@ from __future__ import absolute_import
import collections
import errno
import itertools
+
+from mercurial.i18n import _
from mercurial import (
bundle2,
bundlerepo,
@@ -45,7 +47,6 @@ from mercurial import (
templatefilters,
util,
)
-from mercurial.i18n import _
from . import (
rebase,
diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -5,6 +5,7 @@ repository. See the command help for det
"""
from __future__ import absolute_import
+from mercurial.i18n import _
from mercurial import (
bookmarks as bookmarksmod,
cmdutil,
@@ -17,7 +18,6 @@ from mercurial import (
scmutil,
util,
)
-from mercurial.i18n import _
nullid = nodemod.nullid
release = lockmod.release
diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py
--- a/hgext/win32mbcs.py
+++ b/hgext/win32mbcs.py
@@ -49,11 +49,11 @@ from __future__ import absolute_import
import os
import sys
+from mercurial.i18n import _
from mercurial import (
encoding,
error,
)
-from mercurial.i18n import _
# Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
diff --git a/tests/test-filelog.py b/tests/test-filelog.py
--- a/tests/test-filelog.py
+++ b/tests/test-filelog.py
@@ -3,14 +3,15 @@
Tests the behavior of filelog w.r.t. data starting with '\1\n'
"""
from __future__ import absolute_import, print_function
+
+from mercurial.node import (
+ hex,
+ nullid,
+)
from mercurial import (
hg,
ui as uimod,
)
-from mercurial.node import (
- hex,
- nullid,
-)
myui = uimod.ui()
repo = hg.repository(myui, path='.', create=True)
diff --git a/tests/test-parseindex2.py b/tests/test-parseindex2.py
--- a/tests/test-parseindex2.py
+++ b/tests/test-parseindex2.py
@@ -9,13 +9,13 @@ import struct
import subprocess
import sys
-from mercurial import (
- parsers,
-)
from mercurial.node import (
nullid,
nullrev,
)
+from mercurial import (
+ parsers,
+)
# original python implementation
def gettype(q):
More information about the Mercurial-devel
mailing list