py3: manually import pycompat.open into files that need it

We want to eliminate the source transformer. Currently it inserts
a `from mercurial.pycompat import ...` at the top of files to alias
some builtins.

This commit replaces the implicit import of `open` with an explicit
import on files that need it and changes the source transformer to
no longer import `open`.

As part of this, we needed to store an explicit local for `open` in
the Python 2 code path in `pycompat` so the import works. (Builtins
that are automatically in scope cannot be imported.)

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

hgext/churn.py

@@ -15,6 +15,7 b' import os'
 import time
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     encoding,

hgext/convert/common.py

@@ -15,6 +15,7 b' import shlex'
 import subprocess
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,

hgext/convert/convcmd.py

@@ -11,6 +11,7 b' import os'
 import shutil
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,

hgext/convert/cvs.py

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

hgext/convert/cvsps.py

@@ -11,6 +11,7 b' import os'
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,

hgext/convert/hg.py

@@ -23,6 +23,7 b' import re'
 import time
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     bookmarks,
     context,

hgext/convert/monotone.py

@@ -11,6 +11,7 b' import os'
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     pycompat,

hgext/convert/subversion.py

@@ -8,6 +8,7 b' import re'
 import xml.dom.minidom
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,

hgext/fastannotate/context.py

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

hgext/fastannotate/protocol.py

@@ -10,6 +10,7 b' import contextlib'
 import os
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     extensions,

hgext/fastannotate/revmap.py

@@ -13,6 +13,7 b' import os'
 import struct
 
 from mercurial.node import hex
+from mercurial.pycompat import open
 from mercurial import (
     error as hgerror,
     pycompat,

hgext/fsmonitor/__init__.py

@@ -117,7 +117,7 b' import weakref'
 
 from mercurial.i18n import _
 from mercurial.node import hex
-
+from mercurial.pycompat import open
 from mercurial import (
     context,
     encoding,

hgext/histedit.py

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

hgext/infinitepush/__init__.py

@@ -103,6 +103,8 b' from mercurial.node import ('
 
 from mercurial.i18n import _
 
+from mercurial.pycompat import open
+
 from mercurial.utils import (
     procutil,
     stringutil,

hgext/infinitepush/store.py

@@ -11,6 +11,7 b' import os'
 import subprocess
 import tempfile
 
+from mercurial.pycompat import open
 from mercurial import (
     node,
     pycompat,

hgext/largefiles/lfutil.py

@@ -16,6 +16,7 b' import stat'
 
 from mercurial.i18n import _
 from mercurial.node import hex
+from mercurial.pycompat import open
 
 from mercurial import (
     dirstate,

hgext/largefiles/localstore.py

@@ -10,6 +10,7 b''
 from __future__ import absolute_import
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import util
 
 from . import (

hgext/largefiles/overrides.py

@@ -14,6 +14,8 b' import os'
 
 from mercurial.i18n import _
 
+from mercurial.pycompat import open
+
 from mercurial.hgweb import webcommands
 
 from mercurial import (

hgext/largefiles/proto.py

@@ -8,6 +8,7 b' import os'
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 
 from mercurial import (
     error,

hgext/mq.py

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

hgext/patchbomb.py

@@ -83,6 +83,7 b' import os'
 import socket
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     commands,

hgext/rebase.py

@@ -24,6 +24,7 b' from mercurial.node import ('
     nullrev,
     short,
 )
+from mercurial.pycompat import open
 from mercurial import (
     bookmarks,
     cmdutil,

hgext/releasenotes.py

@@ -18,6 +18,7 b' import errno'
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     config,
     error,

hgext/relink.py

@@ -12,6 +12,7 b' import os'
 import stat
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     hg,

hgext/remotefilelog/__init__.py

@@ -132,6 +132,7 b' import traceback'
 
 from mercurial.node import hex
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     changegroup,
     changelog,

hgext/remotefilelog/basepack.py

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

hgext/remotefilelog/basestore.py

@@ -9,6 +9,7 b' import time'
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex
+from mercurial.pycompat import open
 from mercurial import (
     error,
     pycompat,

hgext/remotefilelog/debugcommands.py

@@ -12,6 +12,7 b' import zlib'
 
 from mercurial.node import bin, hex, nullid, short
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     filelog,

hgext/remotefilelog/remotefilelogserver.py

@@ -14,6 +14,7 b' import zlib'
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex, nullid
+from mercurial.pycompat import open
 from mercurial import (
     changegroup,
     changelog,

hgext/remotefilelog/shallowutil.py

@@ -15,6 +15,7 b' import struct'
 import tempfile
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     node,

hgext/transplant.py

@@ -18,6 +18,7 b' from __future__ import absolute_import'
 import os
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     bundlerepo,
     cmdutil,

mercurial/__init__.py

@@ -172,7 +172,7 b' if sys.version_info[0] >= 3:'
                 l = (
                     b'; from mercurial.pycompat import '
                     b'delattr, getattr, hasattr, setattr, '
-                    b'open, unicode\n'
+                    b'unicode\n'
                 )
                 for u in tokenize.tokenize(io.BytesIO(l).readline):
                     if u.type in (tokenize.ENCODING, token.ENDMARKER):
@@ -221,7 +221,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\x0c'
+    BYTECODEHEADER = b'HG\x00\x0d'
 
     class hgloader(importlib.machinery.SourceFileLoader):
         """Custom module loader that transforms source code.

mercurial/archival.py

@@ -17,6 +17,7 b' import zlib'
 
 from .i18n import _
 from .node import nullrev
+from .pycompat import open
 
 from . import (
     error,

mercurial/changegroup.py

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

mercurial/cmdutil.py

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

mercurial/commands.py

@@ -22,6 +22,7 b' from .node import ('
     wdirhex,
     wdirrev,
 )
+from .pycompat import open
 from . import (
     archival,
     bookmarks,

mercurial/context.py

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

mercurial/crecord.py

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

mercurial/debugcommands.py

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

mercurial/extensions.py

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

mercurial/filemerge.py

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

mercurial/hgweb/common.py

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

mercurial/hgweb/server.py

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

mercurial/httpconnection.py

@@ -13,6 +13,7 b' from __future__ import absolute_import'
 import os
 
 from .i18n import _
+from .pycompat import open
 from . import (
     pycompat,
     util,

mercurial/mail.py

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

mercurial/match.py

@@ -13,6 +13,7 b' import os'
 import re
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,

mercurial/patch.py

@@ -24,6 +24,7 b' from .node import ('
     hex,
     short,
 )
+from .pycompat import open
 from . import (
     copies,
     diffhelper,

mercurial/posix.py

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

mercurial/profiling.py

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

mercurial/pycompat.py

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

mercurial/server.py

@@ -10,6 +10,7 b' from __future__ import absolute_import'
 import os
 
 from .i18n import _
+from .pycompat import open
 
 from . import (
     chgserver,

mercurial/shelve.py

@@ -28,6 +28,7 b' import itertools'
 import stat
 
 from .i18n import _
+from .pycompat import open
 from . import (
     bookmarks,
     bundle2,

mercurial/statprof.py

@@ -114,6 +114,7 b' import sys'
 import threading
 import time
 
+from .pycompat import open
 from . import (
     encoding,
     pycompat,

mercurial/streamclone.py

@@ -12,6 +12,7 b' import os'
 import struct
 
 from .i18n import _
+from .pycompat import open
 from .interfaces import repository
 from . import (
     cacheutil,

mercurial/subrepo.py

@@ -19,6 +19,7 b' import tarfile'
 import xml.dom.minidom
 
 from .i18n import _
+from .pycompat import open
 from . import (
     cmdutil,
     encoding,

mercurial/ui.py

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

mercurial/util.py

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

mercurial/utils/procutil.py

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