# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1570382936 14400
# Node ID eef9a2d67051a11e6269dafb383997fde15d87b7
# Parent  c2e284cee3337cdb6ff984edd087d6fbcff3eaaf
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

diff -r c2e284cee333 -r eef9a2d67051 hgext/churn.py
--- a/hgext/churn.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/churn.py	Sun Oct 06 13:28:56 2019 -0400
@@ -15,6 +15,7 @@
 import time
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/common.py
--- a/hgext/convert/common.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/common.py	Sun Oct 06 13:28:56 2019 -0400
@@ -15,6 +15,7 @@
 import subprocess
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/convcmd.py	Sun Oct 06 13:28:56 2019 -0400
@@ -11,6 +11,7 @@
 import shutil
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/cvs.py	Sun Oct 06 13:28:56 2019 -0400
@@ -12,6 +12,7 @@
 import socket
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/cvsps.py	Sun Oct 06 13:28:56 2019 -0400
@@ -11,6 +11,7 @@
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/hg.py
--- a/hgext/convert/hg.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/hg.py	Sun Oct 06 13:28:56 2019 -0400
@@ -23,6 +23,7 @@
 import time
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     bookmarks,
     context,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/monotone.py
--- a/hgext/convert/monotone.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/monotone.py	Sun Oct 06 13:28:56 2019 -0400
@@ -11,6 +11,7 @@
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/convert/subversion.py	Sun Oct 06 13:28:56 2019 -0400
@@ -8,6 +8,7 @@
 import xml.dom.minidom
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/fastannotate/context.py
--- a/hgext/fastannotate/context.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/fastannotate/context.py	Sun Oct 06 13:28:56 2019 -0400
@@ -13,6 +13,7 @@
 import os
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     linelog as linelogmod,
diff -r c2e284cee333 -r eef9a2d67051 hgext/fastannotate/protocol.py
--- a/hgext/fastannotate/protocol.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/fastannotate/protocol.py	Sun Oct 06 13:28:56 2019 -0400
@@ -10,6 +10,7 @@
 import os
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     extensions,
diff -r c2e284cee333 -r eef9a2d67051 hgext/fastannotate/revmap.py
--- a/hgext/fastannotate/revmap.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/fastannotate/revmap.py	Sun Oct 06 13:28:56 2019 -0400
@@ -13,6 +13,7 @@
 import struct
 
 from mercurial.node import hex
+from mercurial.pycompat import open
 from mercurial import (
     error as hgerror,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/fsmonitor/__init__.py	Sun Oct 06 13:28:56 2019 -0400
@@ -117,7 +117,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import hex
-
+from mercurial.pycompat import open
 from mercurial import (
     context,
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 hgext/histedit.py
--- a/hgext/histedit.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/histedit.py	Sun Oct 06 13:28:56 2019 -0400
@@ -206,6 +206,7 @@
 import struct
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     bundle2,
     cmdutil,
diff -r c2e284cee333 -r eef9a2d67051 hgext/infinitepush/__init__.py
--- a/hgext/infinitepush/__init__.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/infinitepush/__init__.py	Sun Oct 06 13:28:56 2019 -0400
@@ -103,6 +103,8 @@
 
 from mercurial.i18n import _
 
+from mercurial.pycompat import open
+
 from mercurial.utils import (
     procutil,
     stringutil,
diff -r c2e284cee333 -r eef9a2d67051 hgext/infinitepush/store.py
--- a/hgext/infinitepush/store.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/infinitepush/store.py	Sun Oct 06 13:28:56 2019 -0400
@@ -11,6 +11,7 @@
 import subprocess
 import tempfile
 
+from mercurial.pycompat import open
 from mercurial import (
     node,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/largefiles/lfutil.py	Sun Oct 06 13:28:56 2019 -0400
@@ -16,6 +16,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import hex
+from mercurial.pycompat import open
 
 from mercurial import (
     dirstate,
diff -r c2e284cee333 -r eef9a2d67051 hgext/largefiles/localstore.py
--- a/hgext/largefiles/localstore.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/largefiles/localstore.py	Sun Oct 06 13:28:56 2019 -0400
@@ -10,6 +10,7 @@
 from __future__ import absolute_import
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import util
 
 from . import (
diff -r c2e284cee333 -r eef9a2d67051 hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/largefiles/overrides.py	Sun Oct 06 13:28:56 2019 -0400
@@ -14,6 +14,8 @@
 
 from mercurial.i18n import _
 
+from mercurial.pycompat import open
+
 from mercurial.hgweb import webcommands
 
 from mercurial import (
diff -r c2e284cee333 -r eef9a2d67051 hgext/largefiles/proto.py
--- a/hgext/largefiles/proto.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/largefiles/proto.py	Sun Oct 06 13:28:56 2019 -0400
@@ -8,6 +8,7 @@
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 
 from mercurial import (
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/mq.py
--- a/hgext/mq.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/mq.py	Sun Oct 06 13:28:56 2019 -0400
@@ -76,6 +76,7 @@
     nullrev,
     short,
 )
+from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     commands,
diff -r c2e284cee333 -r eef9a2d67051 hgext/patchbomb.py
--- a/hgext/patchbomb.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/patchbomb.py	Sun Oct 06 13:28:56 2019 -0400
@@ -83,6 +83,7 @@
 import socket
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     commands,
diff -r c2e284cee333 -r eef9a2d67051 hgext/rebase.py
--- a/hgext/rebase.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/rebase.py	Sun Oct 06 13:28:56 2019 -0400
@@ -24,6 +24,7 @@
     nullrev,
     short,
 )
+from mercurial.pycompat import open
 from mercurial import (
     bookmarks,
     cmdutil,
diff -r c2e284cee333 -r eef9a2d67051 hgext/releasenotes.py
--- a/hgext/releasenotes.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/releasenotes.py	Sun Oct 06 13:28:56 2019 -0400
@@ -18,6 +18,7 @@
 import re
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     config,
     error,
diff -r c2e284cee333 -r eef9a2d67051 hgext/relink.py
--- a/hgext/relink.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/relink.py	Sun Oct 06 13:28:56 2019 -0400
@@ -12,6 +12,7 @@
 import stat
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     hg,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/__init__.py
--- a/hgext/remotefilelog/__init__.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/__init__.py	Sun Oct 06 13:28:56 2019 -0400
@@ -132,6 +132,7 @@
 
 from mercurial.node import hex
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     changegroup,
     changelog,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/basepack.py
--- a/hgext/remotefilelog/basepack.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/basepack.py	Sun Oct 06 13:28:56 2019 -0400
@@ -9,6 +9,7 @@
 import time
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     node as nodemod,
     policy,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/basestore.py
--- a/hgext/remotefilelog/basestore.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/basestore.py	Sun Oct 06 13:28:56 2019 -0400
@@ -9,6 +9,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex
+from mercurial.pycompat import open
 from mercurial import (
     error,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/debugcommands.py
--- a/hgext/remotefilelog/debugcommands.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/debugcommands.py	Sun Oct 06 13:28:56 2019 -0400
@@ -12,6 +12,7 @@
 
 from mercurial.node import bin, hex, nullid, short
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     filelog,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/remotefilelogserver.py
--- a/hgext/remotefilelog/remotefilelogserver.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/remotefilelogserver.py	Sun Oct 06 13:28:56 2019 -0400
@@ -14,6 +14,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex, nullid
+from mercurial.pycompat import open
 from mercurial import (
     changegroup,
     changelog,
diff -r c2e284cee333 -r eef9a2d67051 hgext/remotefilelog/shallowutil.py
--- a/hgext/remotefilelog/shallowutil.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/remotefilelog/shallowutil.py	Sun Oct 06 13:28:56 2019 -0400
@@ -15,6 +15,7 @@
 import tempfile
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     error,
     node,
diff -r c2e284cee333 -r eef9a2d67051 hgext/transplant.py
--- a/hgext/transplant.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/hgext/transplant.py	Sun Oct 06 13:28:56 2019 -0400
@@ -18,6 +18,7 @@
 import os
 
 from mercurial.i18n import _
+from mercurial.pycompat import open
 from mercurial import (
     bundlerepo,
     cmdutil,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/__init__.py
--- a/mercurial/__init__.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/__init__.py	Sun Oct 06 13:28:56 2019 -0400
@@ -172,7 +172,7 @@
                 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 @@
     # ``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.
diff -r c2e284cee333 -r eef9a2d67051 mercurial/archival.py
--- a/mercurial/archival.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/archival.py	Sun Oct 06 13:28:56 2019 -0400
@@ -17,6 +17,7 @@
 
 from .i18n import _
 from .node import nullrev
+from .pycompat import open
 
 from . import (
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/changegroup.py
--- a/mercurial/changegroup.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/changegroup.py	Sun Oct 06 13:28:56 2019 -0400
@@ -18,6 +18,7 @@
     nullrev,
     short,
 )
+from .pycompat import open
 
 from . import (
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/cmdutil.py	Sun Oct 06 13:28:56 2019 -0400
@@ -19,6 +19,7 @@
     nullrev,
     short,
 )
+from .pycompat import open
 
 from . import (
     bookmarks,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/commands.py
--- a/mercurial/commands.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/commands.py	Sun Oct 06 13:28:56 2019 -0400
@@ -22,6 +22,7 @@
     wdirhex,
     wdirrev,
 )
+from .pycompat import open
 from . import (
     archival,
     bookmarks,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/context.py
--- a/mercurial/context.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/context.py	Sun Oct 06 13:28:56 2019 -0400
@@ -23,6 +23,7 @@
     wdirfilenodeids,
     wdirhex,
 )
+from .pycompat import open
 from . import (
     copies,
     dagop,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/crecord.py
--- a/mercurial/crecord.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/crecord.py	Sun Oct 06 13:28:56 2019 -0400
@@ -16,6 +16,7 @@
 import signal
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/debugcommands.py
--- a/mercurial/debugcommands.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/debugcommands.py	Sun Oct 06 13:28:56 2019 -0400
@@ -32,6 +32,7 @@
     nullrev,
     short,
 )
+from .pycompat import open
 from . import (
     bundle2,
     changegroup,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/extensions.py
--- a/mercurial/extensions.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/extensions.py	Sun Oct 06 13:28:56 2019 -0400
@@ -18,6 +18,7 @@
     _,
     gettext,
 )
+from .pycompat import open
 
 from . import (
     cmdutil,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/filemerge.py	Sun Oct 06 13:28:56 2019 -0400
@@ -18,6 +18,7 @@
     nullid,
     short,
 )
+from .pycompat import open
 
 from . import (
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/hgweb/common.py	Sun Oct 06 13:28:56 2019 -0400
@@ -14,6 +14,7 @@
 import os
 import stat
 
+from ..pycompat import open
 from .. import (
     encoding,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/hgweb/server.py
--- a/mercurial/hgweb/server.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/hgweb/server.py	Sun Oct 06 13:28:56 2019 -0400
@@ -17,6 +17,7 @@
 import wsgiref.validate
 
 from ..i18n import _
+from ..pycompat import open
 
 from .. import (
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/httpconnection.py
--- a/mercurial/httpconnection.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/httpconnection.py	Sun Oct 06 13:28:56 2019 -0400
@@ -13,6 +13,7 @@
 import os
 
 from .i18n import _
+from .pycompat import open
 from . import (
     pycompat,
     util,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/mail.py
--- a/mercurial/mail.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/mail.py	Sun Oct 06 13:28:56 2019 -0400
@@ -19,6 +19,7 @@
 import time
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/match.py
--- a/mercurial/match.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/match.py	Sun Oct 06 13:28:56 2019 -0400
@@ -13,6 +13,7 @@
 import re
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/patch.py
--- a/mercurial/patch.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/patch.py	Sun Oct 06 13:28:56 2019 -0400
@@ -24,6 +24,7 @@
     hex,
     short,
 )
+from .pycompat import open
 from . import (
     copies,
     diffhelper,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/posix.py
--- a/mercurial/posix.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/posix.py	Sun Oct 06 13:28:56 2019 -0400
@@ -21,6 +21,7 @@
 import unicodedata
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/profiling.py
--- a/mercurial/profiling.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/profiling.py	Sun Oct 06 13:28:56 2019 -0400
@@ -10,6 +10,7 @@
 import contextlib
 
 from .i18n import _
+from .pycompat import open
 from . import (
     encoding,
     error,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/pycompat.py
--- a/mercurial/pycompat.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/pycompat.py	Sun Oct 06 13:28:56 2019 -0400
@@ -354,6 +354,7 @@
     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')
diff -r c2e284cee333 -r eef9a2d67051 mercurial/server.py
--- a/mercurial/server.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/server.py	Sun Oct 06 13:28:56 2019 -0400
@@ -10,6 +10,7 @@
 import os
 
 from .i18n import _
+from .pycompat import open
 
 from . import (
     chgserver,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/shelve.py
--- a/mercurial/shelve.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/shelve.py	Sun Oct 06 13:28:56 2019 -0400
@@ -28,6 +28,7 @@
 import stat
 
 from .i18n import _
+from .pycompat import open
 from . import (
     bookmarks,
     bundle2,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/statprof.py
--- a/mercurial/statprof.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/statprof.py	Sun Oct 06 13:28:56 2019 -0400
@@ -114,6 +114,7 @@
 import threading
 import time
 
+from .pycompat import open
 from . import (
     encoding,
     pycompat,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/streamclone.py
--- a/mercurial/streamclone.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/streamclone.py	Sun Oct 06 13:28:56 2019 -0400
@@ -12,6 +12,7 @@
 import struct
 
 from .i18n import _
+from .pycompat import open
 from .interfaces import repository
 from . import (
     cacheutil,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/subrepo.py	Sun Oct 06 13:28:56 2019 -0400
@@ -19,6 +19,7 @@
 import xml.dom.minidom
 
 from .i18n import _
+from .pycompat import open
 from . import (
     cmdutil,
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/ui.py
--- a/mercurial/ui.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/ui.py	Sun Oct 06 13:28:56 2019 -0400
@@ -22,6 +22,7 @@
 
 from .i18n import _
 from .node import hex
+from .pycompat import open
 
 from . import (
     color,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/util.py
--- a/mercurial/util.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/util.py	Sun Oct 06 13:28:56 2019 -0400
@@ -35,6 +35,7 @@
 import warnings
 
 from .thirdparty import attr
+from .pycompat import open
 from hgdemandimport import tracing
 from . import (
     encoding,
diff -r c2e284cee333 -r eef9a2d67051 mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py	Sun Oct 06 13:17:19 2019 -0400
+++ b/mercurial/utils/procutil.py	Sun Oct 06 13:28:56 2019 -0400
@@ -20,6 +20,7 @@
 import time
 
 from ..i18n import _
+from ..pycompat import open
 
 from .. import (
     encoding,