py3: manually import getattr where it is needed

The march continues.

Differential Revision: https://phab.mercurial-scm.org/D7009

hgext/convert/cvs.py

@@ -12,7 +12,10 b' import re'
 import socket
 
 from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    getattr,
+    open,
+)
 from mercurial import (
     encoding,
     error,

hgext/convert/transport.py

@@ -25,6 +25,7 b' import svn.ra'
 Pool = svn.core.Pool
 SubversionException = svn.core.SubversionException
 
+from mercurial.pycompat import getattr
 from mercurial import util
 
 # Some older versions of the Python bindings need to be

hgext/fastannotate/context.py

@@ -14,6 +14,7 b' import os'
 
 from mercurial.i18n import _
 from mercurial.pycompat import (
+    getattr,
     open,
     setattr,
 )

hgext/fastannotate/support.py

@@ -7,6 +7,7 b''
 
 from __future__ import absolute_import
 
+from mercurial.pycompat import getattr
 from mercurial import (
     context as hgcontext,
     dagop,

hgext/histedit.py

@@ -206,7 +206,10 b' import os'
 import struct
 
 from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    getattr,
+    open,
+)
 from mercurial import (
     bundle2,
     cmdutil,

hgext/infinitepush/__init__.py

@@ -103,7 +103,10 b' from mercurial.node import ('
 
 from mercurial.i18n import _
 
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    getattr,
+    open,
+)
 
 from mercurial.utils import (
     procutil,

hgext/keyword.py

@@ -90,6 +90,7 b' import re'
 import weakref
 
 from mercurial.i18n import _
+from mercurial.pycompat import getattr
 from mercurial.hgweb import webcommands
 
 from mercurial import (

hgext/largefiles/storefactory.py

@@ -6,7 +6,7 b' from __future__ import absolute_import'
 import re
 
 from mercurial.i18n import _
-
+from mercurial.pycompat import getattr
 from mercurial import (
     error,
     hg,

hgext/lfs/blobstore.py

@@ -16,6 +16,7 b' import re'
 import socket
 
 from mercurial.i18n import _
+from mercurial.pycompat import getattr
 
 from mercurial import (
     encoding,

hgext/lfs/wrapper.py

@@ -11,7 +11,10 b' import hashlib'
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex, nullid, short
-from mercurial.pycompat import setattr
+from mercurial.pycompat import (
+    getattr,
+    setattr,
+)
 
 from mercurial import (
     bundle2,

hgext/mq.py

@@ -76,7 +76,10 b' from mercurial.node import ('
     nullrev,
     short,
 )
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    getattr,
+    open,
+)
 from mercurial import (
     cmdutil,
     commands,

hgext/phabricator.py

@@ -49,6 +49,7 b' import re'
 
 from mercurial.node import bin, nullid
 from mercurial.i18n import _
+from mercurial.pycompat import getattr
 from mercurial import (
     cmdutil,
     context,

hgext/remotefilelog/basepack.py

@@ -9,7 +9,10 b' import struct'
 import time
 
 from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    getattr,
+    open,
+)
 from mercurial import (
     node as nodemod,
     policy,

hgext/remotefilelog/contentstore.py

@@ -3,6 +3,7 b' from __future__ import absolute_import'
 import threading
 
 from mercurial.node import hex, nullid
+from mercurial.pycompat import getattr
 from mercurial import (
     mdiff,
     pycompat,

hgext/strip.py

@@ -6,6 +6,7 b' repository. See the command help for det'
 from __future__ import absolute_import
 
 from mercurial.i18n import _
+from mercurial.pycompat import getattr
 from mercurial import (
     bookmarks as bookmarksmod,
     cmdutil,

hgext/win32mbcs.py

@@ -50,7 +50,7 b' import os'
 import sys
 
 from mercurial.i18n import _
-from mercurial.pycompat import setattr
+from mercurial.pycompat import getattr, setattr
 from mercurial import (
     encoding,
     error,

mercurial/__init__.py

@@ -171,7 +171,7 b' if sys.version_info[0] >= 3:'
                 r, c = t.start
                 l = (
                     b'; from mercurial.pycompat import '
-                    b'delattr, getattr\n'
+                    b'delattr\n'
                 )
                 for u in tokenize.tokenize(io.BytesIO(l).readline):
                     if u.type in (tokenize.ENCODING, token.ENDMARKER):
@@ -220,7 +220,7 b' if sys.version_info[0] >= 3:'
     # ``replacetoken`` or any mechanism that changes semantics of module
     # loading is changed. Otherwise cached bytecode may get loaded without
     # the new transformation mechanisms applied.
-    BYTECODEHEADER = b'HG\x00\x10'
+    BYTECODEHEADER = b'HG\x00\x11'
 
     class hgloader(importlib.machinery.SourceFileLoader):
         """Custom module loader that transforms source code.

mercurial/bookmarks.py

@@ -17,6 +17,7 b' from .node import ('
     short,
     wdirid,
 )
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/chgserver.py

@@ -51,7 +51,10 b' import struct'
 import time
 
 from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 
 from . import (
     commandserver,

mercurial/cmdutil.py

@@ -20,6 +20,7 b' from .node import ('
     short,
 )
 from .pycompat import (
+    getattr,
     open,
     setattr,
 )

mercurial/color.py

@@ -10,6 +10,7 b' from __future__ import absolute_import'
 import re
 
 from .i18n import _
+from .pycompat import getattr
 
 from . import (
     encoding,

mercurial/commandserver.py

@@ -24,6 +24,7 b' except ImportError:'
     from .thirdparty import selectors2 as selectors
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/config.py

@@ -11,6 +11,7 b' import errno'
 import os
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     pycompat,

mercurial/context.py

@@ -23,7 +23,10 b' from .node import ('
     wdirfilenodeids,
     wdirhex,
 )
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     copies,
     dagop,

mercurial/crecord.py

@@ -16,7 +16,10 b' import re'
 import signal
 
 from .i18n import _
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     encoding,
     error,

mercurial/debugcommands.py

@@ -32,7 +32,10 b' from .node import ('
     nullrev,
     short,
 )
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     bundle2,
     changegroup,

mercurial/dispatch.py

@@ -20,6 +20,7 b' import traceback'
 
 
 from .i18n import _
+from .pycompat import getattr
 
 from hgdemandimport import tracing
 

mercurial/encoding.py

@@ -11,6 +11,7 b' import locale'
 import os
 import unicodedata
 
+from .pycompat import getattr
 from . import (
     error,
     policy,

mercurial/extensions.py

@@ -19,6 +19,7 b' from .i18n import ('
     gettext,
 )
 from .pycompat import (
+    getattr,
     open,
     setattr,
 )

mercurial/filemerge.py

@@ -18,7 +18,10 b' from .node import ('
     nullid,
     short,
 )
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 
 from . import (
     encoding,

mercurial/fileset.py

@@ -11,6 +11,7 b' import errno'
 import re
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     filesetlang,

mercurial/filesetlang.py

@@ -8,6 +8,7 b''
 from __future__ import absolute_import
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     parser,

mercurial/help.py

@@ -16,6 +16,7 b' from .i18n import ('
     _,
     gettext,
 )
+from .pycompat import getattr
 from . import (
     cmdutil,
     encoding,

mercurial/hg.py

@@ -16,6 +16,7 b' import stat'
 
 from .i18n import _
 from .node import nullid
+from .pycompat import getattr
 
 from . import (
     bookmarks,

mercurial/hgweb/common.py

@@ -14,7 +14,10 b' import mimetypes'
 import os
 import stat
 
-from ..pycompat import open
+from ..pycompat import (
+    getattr,
+    open,
+)
 from .. import (
     encoding,
     pycompat,

mercurial/hgweb/hgweb_mod.py

@@ -18,6 +18,7 b' from .common import ('
     permhooks,
     statusmessage,
 )
+from ..pycompat import getattr
 
 from .. import (
     encoding,

mercurial/hgweb/server.py

@@ -17,7 +17,10 b' import traceback'
 import wsgiref.validate
 
 from ..i18n import _
-from ..pycompat import open
+from ..pycompat import (
+    getattr,
+    open,
+)
 
 from .. import (
     encoding,

mercurial/hgweb/webcommands.py

@@ -14,6 +14,7 b' import re'
 
 from ..i18n import _
 from ..node import hex, short
+from ..pycompat import getattr
 
 from .common import (
     ErrorResponse,

mercurial/hgweb/wsgicgi.py

@@ -12,6 +12,7 b' from __future__ import absolute_import'
 
 import os
 
+from ..pycompat import getattr
 from .. import pycompat
 
 from ..utils import procutil

mercurial/hook.py

@@ -11,6 +11,7 b' import os'
 import sys
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     demandimport,
     encoding,

mercurial/httppeer.py

@@ -16,6 +16,7 b' import struct'
 import weakref
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     bundle2,
     error,

mercurial/i18n.py

@@ -12,6 +12,7 b' import locale'
 import os
 import sys
 
+from .pycompat import getattr
 from . import (
     encoding,
     pycompat,

mercurial/keepalive.py

@@ -92,6 +92,7 b' import sys'
 import threading
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     node,
     pycompat,

mercurial/localrepo.py

@@ -23,6 +23,7 b' from .node import ('
     nullrev,
     short,
 )
+from .pycompat import getattr
 from . import (
     bookmarks,
     branchmap,

mercurial/lock.py

@@ -16,6 +16,7 b' import time'
 import warnings
 
 from .i18n import _
+from .pycompat import getattr
 
 from . import (
     encoding,

mercurial/lsprof.py

@@ -3,6 +3,8 b' from __future__ import absolute_import, '
 import _lsprof
 import sys
 
+from .pycompat import getattr
+
 Profiler = _lsprof.Profiler
 
 # PyPy doesn't expose profiler_entry from the module.

mercurial/mail.py

@@ -19,7 +19,10 b' import socket'
 import time
 
 from .i18n import _
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     encoding,
     error,

mercurial/manifest.py

@@ -19,6 +19,7 b' from .node import ('
     nullid,
     nullrev,
 )
+from .pycompat import getattr
 from . import (
     error,
     mdiff,

mercurial/mdiff.py

@@ -12,7 +12,10 b' import struct'
 import zlib
 
 from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 from . import (
     encoding,
     error,

mercurial/narrowspec.py

@@ -8,6 +8,7 b''
 from __future__ import absolute_import
 
 from .i18n import _
+from .pycompat import getattr
 from .interfaces import repository
 from . import (
     error,

mercurial/obsolete.py

@@ -74,6 +74,7 b' import hashlib'
 import struct
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/phases.py

@@ -113,7 +113,10 b' from .node import ('
     nullrev,
     short,
 )
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 from . import (
     error,
     pycompat,

mercurial/policy.py

@@ -10,6 +10,8 b' from __future__ import absolute_import'
 import os
 import sys
 
+from .pycompat import getattr
+
 # Rules for how modules can be loaded. Values are:
 #
 #    c - require C extensions

mercurial/posix.py

@@ -21,7 +21,10 b' import tempfile'
 import unicodedata
 
 from .i18n import _
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     encoding,
     error,

mercurial/profiling.py

@@ -10,7 +10,10 b' from __future__ import absolute_import, '
 import contextlib
 
 from .i18n import _
-from .pycompat import open
+from .pycompat import (
+    getattr,
+    open,
+)
 from . import (
     encoding,
     error,

mercurial/pure/osutil.py

@@ -13,6 +13,7 b' import os'
 import socket
 import stat as statmod
 
+from ..pycompat import getattr
 from .. import (
     encoding,
     pycompat,

mercurial/pycompat.py

@@ -355,6 +355,7 b' else:'
     strurl = identity
     bytesurl = identity
     open = open
+    getattr = getattr
     hasattr = hasattr
     setattr = setattr
 

mercurial/repoview.py

@@ -12,7 +12,10 b' import copy'
 import weakref
 
 from .node import nullrev
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 from . import (
     obsolete,
     phases,

mercurial/revlog.py

@@ -35,6 +35,7 b' from .node import ('
     wdirrev,
 )
 from .i18n import _
+from .pycompat import getattr
 from .revlogutils.constants import (
     FLAG_GENERALDELTA,
     FLAG_INLINE_DATA,

mercurial/revlogutils/deltas.py

@@ -15,6 +15,7 b' import struct'
 # import stuff from node for others to import from revlog
 from ..node import nullrev
 from ..i18n import _
+from ..pycompat import getattr
 
 from .constants import (
     REVIDX_ISCENSORED,

mercurial/revset.py

@@ -10,6 +10,7 b' from __future__ import absolute_import'
 import re
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     dagop,
     destutil,

mercurial/revsetlang.py

@@ -10,6 +10,7 b' from __future__ import absolute_import'
 import string
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     node,

mercurial/scmposix.py

@@ -6,6 +6,7 b' import fcntl'
 import os
 import sys
 
+from .pycompat import getattr
 from . import (
     encoding,
     pycompat,

mercurial/scmutil.py

@@ -26,6 +26,7 b' from .node import ('
     wdirid,
     wdirrev,
 )
+from .pycompat import getattr
 
 from . import (
     copies as copiesmod,

mercurial/smartset.py

@@ -7,6 +7,7 b''
 
 from __future__ import absolute_import
 
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/sshpeer.py

@@ -11,6 +11,7 b' import re'
 import uuid
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     pycompat,

mercurial/sslutil.py

@@ -15,6 +15,7 b' import re'
 import ssl
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/store.py

@@ -14,6 +14,7 b' import os'
 import stat
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     changelog,
     error,

mercurial/subrepoutil.py

@@ -13,6 +13,7 b' import posixpath'
 import re
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     config,
     error,

mercurial/templater.py

@@ -68,6 +68,7 b' import abc'
 import os
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     config,
     encoding,

mercurial/templateutil.py

@@ -11,6 +11,7 b' import abc'
 import types
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     error,
     pycompat,

mercurial/testing/storage.py

@@ -14,6 +14,7 b' from ..node import ('
     nullid,
     nullrev,
 )
+from ..pycompat import getattr
 from .. import (
     error,
     mdiff,

mercurial/ui.py

@@ -23,6 +23,7 b' import traceback'
 from .i18n import _
 from .node import hex
 from .pycompat import (
+    getattr,
     open,
     setattr,
 )

mercurial/unionrepo.py

@@ -14,6 +14,7 b' allowing operations like diff and log wi'
 from __future__ import absolute_import
 
 from .i18n import _
+from .pycompat import getattr
 
 from . import (
     changelog,

mercurial/upgrade.py

@@ -10,6 +10,7 b' from __future__ import absolute_import'
 import stat
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     changelog,
     error,

mercurial/url.py

@@ -15,6 +15,7 b' import socket'
 import sys
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/urllibcompat.py

@@ -6,6 +6,7 b''
 # GNU General Public License version 2 or any later version.
 from __future__ import absolute_import
 
+from .pycompat import getattr
 from . import pycompat
 
 _sysstr = pycompat.sysstr

mercurial/util.py

@@ -36,6 +36,7 b' import warnings'
 
 from .thirdparty import attr
 from .pycompat import (
+    getattr,
     open,
     setattr,
 )

mercurial/utils/compression.py

@@ -10,6 +10,7 b' import bz2'
 import collections
 import zlib
 
+from ..pycompat import getattr
 from .. import (
     error,
     i18n,

mercurial/utils/procutil.py

@@ -20,7 +20,10 b' import sys'
 import time
 
 from ..i18n import _
-from ..pycompat import open
+from ..pycompat import (
+    getattr,
+    open,
+)
 
 from .. import (
     encoding,

mercurial/vfs.py

@@ -14,7 +14,10 b' import stat'
 import threading
 
 from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 from . import (
     encoding,
     error,

mercurial/windows.py

@@ -16,6 +16,7 b' import string'
 import sys
 
 from .i18n import _
+from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/wireprotoframing.py

@@ -15,6 +15,7 b' import collections'
 import struct
 
 from .i18n import _
+from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     encoding,

mercurial/wireprototypes.py

@@ -10,6 +10,7 b' from .node import ('
     hex,
 )
 from .i18n import _
+from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     error,

mercurial/wireprotov1peer.py

@@ -13,7 +13,10 b' import weakref'
 
 from .i18n import _
 from .node import bin
-from .pycompat import setattr
+from .pycompat import (
+    getattr,
+    setattr,
+)
 from . import (
     bundle2,
     changegroup as changegroupmod,

mercurial/wireprotov1server.py

@@ -15,6 +15,7 b' from .node import ('
     hex,
     nullid,
 )
+from .pycompat import getattr
 
 from . import (
     bundle2,