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 _

contrib/synthrepo.py

@@ -45,6 +45,13 b' 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 b' 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

hgext/automv.py

@@ -26,6 +26,7 b' 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 b' from mercurial import ('
     scmutil,
     similar
 )
-from mercurial.i18n import _
 
 def extsetup(ui):
     entry = extensions.wrapcommand(

hgext/color.py

@@ -156,6 +156,8 b' 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 b' from mercurial import ('
     ui as uimod,
     util,
 )
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/convert/__init__.py

@@ -9,11 +9,11 b''
 
 from __future__ import absolute_import
 
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     registrar,
 )
-from mercurial.i18n import _
 
 from . import (
     convcmd,

hgext/convert/bzr.py

@@ -10,11 +10,12 b''
 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

hgext/convert/common.py

@@ -14,12 +14,12 b' import os'
 import re
 import subprocess
 
+from mercurial.i18n import _
 from mercurial import (
     error,
     phases,
     util,
 )
-from mercurial.i18n import _
 
 propertycache = util.propertycache
 

hgext/convert/convcmd.py

@@ -10,13 +10,13 b' import os'
 import shlex
 import shutil
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
     hg,
     util,
 )
-from mercurial.i18n import _
 
 from . import (
     bzr,

hgext/convert/cvs.py

@@ -11,12 +11,12 b' import os'
 import re
 import socket
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
     util,
 )
-from mercurial.i18n import _
 
 from . import (
     common,

hgext/convert/cvsps.py

@@ -10,11 +10,11 b' 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:

hgext/convert/filemap.py

@@ -7,10 +7,11 b' 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
 

hgext/convert/git.py

@@ -7,12 +7,13 b''
 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,

hgext/convert/gnuarch.py

@@ -12,12 +12,13 b' 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):

hgext/convert/hg.py

@@ -22,6 +22,7 b' import os'
 import re
 import time
 
+from mercurial.i18n import _
 from mercurial import (
     bookmarks,
     context,
@@ -37,7 +38,6 b' from mercurial import ('
 )
 stringio = util.stringio
 
-from mercurial.i18n import _
 from . import common
 mapfile = common.mapfile
 NoRepo = common.NoRepo

hgext/convert/monotone.py

@@ -10,11 +10,11 b' 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
 

hgext/convert/p4.py

@@ -9,11 +9,11 b' 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
 

hgext/convert/subversion.py

@@ -10,6 +10,7 b' import sys'
 import tempfile
 import xml.dom.minidom
 
+from mercurial.i18n import _
 from mercurial import (
     encoding,
     error,
@@ -17,7 +18,6 b' from mercurial import ('
     strutil,
     util,
 )
-from mercurial.i18n import _
 
 from . import common
 

hgext/fsmonitor/__init__.py

@@ -95,6 +95,7 b' import os'
 import stat
 import sys
 
+from mercurial.i18n import _
 from mercurial import (
     context,
     extensions,
@@ -105,7 +106,6 b' from mercurial import ('
     util,
 )
 from mercurial import match as matchmod
-from mercurial.i18n import _
 
 from . import (
     state,

hgext/fsmonitor/state.py

@@ -12,8 +12,8 b' import os'
 import socket
 import struct
 
+from mercurial.i18n import _
 from mercurial import pathutil
-from mercurial.i18n import _
 
 _version = 4
 _versionformat = ">I"

hgext/gpg.py

@@ -10,6 +10,8 b' from __future__ import absolute_import'
 import binascii
 import os
 import tempfile
+
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     commands,
@@ -18,7 +20,6 b' from mercurial import ('
     node as hgnode,
     util,
 )
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/hgk.py

@@ -37,6 +37,13 b' 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 b' from mercurial import ('
     patch,
     scmutil,
 )
-from mercurial.node import (
-    nullid,
-    nullrev,
-    short,
-)
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/histedit.py

@@ -175,6 +175,8 b' import errno'
 import os
 import pickle
 import sys
+
+from mercurial.i18n import _
 from mercurial import (
     bundle2,
     cmdutil,
@@ -194,7 +196,6 b' from mercurial import ('
     scmutil,
     util,
 )
-from mercurial.i18n import _
 
 release = lock.release
 cmdtable = {}

hgext/keyword.py

@@ -89,8 +89,8 b' import os'
 import re
 import tempfile
 
+from mercurial.i18n import _
 from mercurial.hgweb import webcommands
-from mercurial.i18n import _
 
 from mercurial import (
     cmdutil,

hgext/notify.py

@@ -139,6 +139,7 b' import fnmatch'
 import socket
 import time
 
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     error,
@@ -146,7 +147,6 b' 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

hgext/pager.py

@@ -66,6 +66,7 b' import signal'
 import subprocess
 import sys
 
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     commands,
@@ -73,7 +74,6 b' 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

hgext/patchbomb.py

@@ -71,6 +71,7 b' import os'
 import socket
 import tempfile
 
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     commands,
@@ -83,7 +84,6 b' from mercurial import ('
     util,
 )
 stringio = util.stringio
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/purge.py

@@ -27,6 +27,7 b' from __future__ import absolute_import'
 
 import os
 
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     commands,
@@ -34,7 +35,6 b' from mercurial import ('
     scmutil,
     util,
 )
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/rebase.py

@@ -18,6 +18,14 b' 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 b' from mercurial import ('
     scmutil,
     util,
 )
-from mercurial.node import (
-    hex,
-    nullid,
-    nullrev,
-    short,
-)
-from mercurial.i18n import _
 
 release = lock.release
 templateopts = commands.templateopts

hgext/record.py

@@ -12,13 +12,13 b' 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)

hgext/relink.py

@@ -11,13 +11,13 b' 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)

hgext/schemes.py

@@ -43,6 +43,8 b' from __future__ import absolute_import'
 
 import os
 import re
+
+from mercurial.i18n import _
 from mercurial import (
     cmdutil,
     error,
@@ -51,7 +53,6 b' from mercurial import ('
     templater,
     util,
 )
-from mercurial.i18n import _
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)

hgext/shelve.py

@@ -25,6 +25,8 b' from __future__ import absolute_import'
 import collections
 import errno
 import itertools
+
+from mercurial.i18n import _
 from mercurial import (
     bundle2,
     bundlerepo,
@@ -45,7 +47,6 b' from mercurial import ('
     templatefilters,
     util,
 )
-from mercurial.i18n import _
 
 from . import (
     rebase,

hgext/strip.py

@@ -5,6 +5,7 b' 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 b' from mercurial import ('
     scmutil,
     util,
 )
-from mercurial.i18n import _
 nullid = nodemod.nullid
 release = lockmod.release
 

hgext/win32mbcs.py

@@ -49,11 +49,11 b' 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

tests/test-filelog.py

@@ -3,14 +3,15 b''
 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)

tests/test-parseindex2.py

@@ -9,13 +9,13 b' 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):