py3: manually import pycompat.setattr where it is needed

Continuing to eliminate the implicit import of symbols in the
Python 3 source transformer so we can eliminate it.

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

hgext/factotum.py

@@ -49,6 +49,7 b' from __future__ import absolute_import'
 
 import os
 from mercurial.i18n import _
+from mercurial.pycompat import setattr
 from mercurial.utils import procutil
 from mercurial import (
     error,

hgext/fastannotate/context.py

@@ -13,7 +13,10 b' import hashlib'
 import os
 
 from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+    open,
+    setattr,
+)
 from mercurial import (
     error,
     linelog as linelogmod,

hgext/fix.py

@@ -132,6 +132,7 b' import subprocess'
 from mercurial.i18n import _
 from mercurial.node import nullrev
 from mercurial.node import wdirrev
+from mercurial.pycompat import setattr
 
 from mercurial.utils import (
     procutil,

hgext/lfs/wrapper.py

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

hgext/sparse.py

@@ -74,6 +74,7 b' certain files::'
 from __future__ import absolute_import
 
 from mercurial.i18n import _
+from mercurial.pycompat import setattr
 from mercurial import (
     commands,
     dirstate,

hgext/win32mbcs.py

@@ -50,6 +50,7 b' import os'
 import sys
 
 from mercurial.i18n import _
+from mercurial.pycompat import 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, hasattr, setattr\n'
+                    b'delattr, getattr, hasattr\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\x0e'
+    BYTECODEHEADER = b'HG\x00\x0f'
 
     class hgloader(importlib.machinery.SourceFileLoader):
         """Custom module loader that transforms source code.

mercurial/chgserver.py

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

mercurial/cmdutil.py

@@ -19,7 +19,10 b' from .node import ('
     nullrev,
     short,
 )
-from .pycompat import open
+from .pycompat import (
+    open,
+    setattr,
+)
 
 from . import (
     bookmarks,

mercurial/extensions.py

@@ -18,7 +18,10 b' from .i18n import ('
     _,
     gettext,
 )
-from .pycompat import open
+from .pycompat import (
+    open,
+    setattr,
+)
 
 from . import (
     cmdutil,

mercurial/hgweb/webutil.py

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

mercurial/mdiff.py

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

mercurial/phases.py

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

mercurial/pycompat.py

@@ -355,6 +355,7 b' else:'
     strurl = identity
     bytesurl = identity
     open = open
+    setattr = setattr
 
     # this can't be parsed on Python 3
     exec(b'def raisewithtb(exc, tb):\n' b'    raise exc, None, tb\n')

mercurial/repoview.py

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

mercurial/ui.py

@@ -22,7 +22,10 b' import traceback'
 
 from .i18n import _
 from .node import hex
-from .pycompat import open
+from .pycompat import (
+    open,
+    setattr,
+)
 
 from . import (
     color,

mercurial/util.py

@@ -35,7 +35,10 b' import traceback'
 import warnings
 
 from .thirdparty import attr
-from .pycompat import open
+from .pycompat import (
+    open,
+    setattr,
+)
 from hgdemandimport import tracing
 from . import (
     encoding,

mercurial/vfs.py

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

mercurial/wireprotov1peer.py

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