@@ -20,6 +20,7 @@
import time
from ..i18n import _
+from ..pycompat import open
from .. import (
encoding,
@@ -35,6 +35,7 @@
import warnings
from .thirdparty import attr
+from .pycompat import open
from hgdemandimport import tracing
from . import (
encoding,
@@ -22,6 +22,7 @@
from .i18n import _
from .node import hex
+from .pycompat import open
from . import (
color,
@@ -19,6 +19,7 @@
import xml.dom.minidom
from .i18n import _
+from .pycompat import open
from . import (
cmdutil,
encoding,
@@ -12,6 +12,7 @@
import struct
from .i18n import _
+from .pycompat import open
from .interfaces import repository
from . import (
cacheutil,
@@ -114,6 +114,7 @@
import threading
import time
+from .pycompat import open
from . import (
encoding,
pycompat,
@@ -28,6 +28,7 @@
import stat
from .i18n import _
+from .pycompat import open
from . import (
bookmarks,
bundle2,
@@ -10,6 +10,7 @@
import os
from .i18n import _
+from .pycompat import open
from . import (
chgserver,
@@ -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')
@@ -10,6 +10,7 @@
import contextlib
from .i18n import _
+from .pycompat import open
from . import (
encoding,
error,
@@ -21,6 +21,7 @@
import unicodedata
from .i18n import _
+from .pycompat import open
from . import (
encoding,
error,
@@ -24,6 +24,7 @@
hex,
short,
)
+from .pycompat import open
from . import (
copies,
diffhelper,
@@ -13,6 +13,7 @@
import re
from .i18n import _
+from .pycompat import open
from . import (
encoding,
error,
@@ -19,6 +19,7 @@
import time
from .i18n import _
+from .pycompat import open
from . import (
encoding,
error,
@@ -13,6 +13,7 @@
import os
from .i18n import _
+from .pycompat import open
from . import (
pycompat,
util,
@@ -17,6 +17,7 @@
import wsgiref.validate
from ..i18n import _
+from ..pycompat import open
from .. import (
encoding,
@@ -14,6 +14,7 @@
import os
import stat
+from ..pycompat import open
from .. import (
encoding,
pycompat,
@@ -18,6 +18,7 @@
nullid,
short,
)
+from .pycompat import open
from . import (
encoding,
@@ -18,6 +18,7 @@
_,
gettext,
)
+from .pycompat import open
from . import (
cmdutil,
@@ -32,6 +32,7 @@
nullrev,
short,
)
+from .pycompat import open
from . import (
bundle2,
changegroup,
@@ -16,6 +16,7 @@
import signal
from .i18n import _
+from .pycompat import open
from . import (
encoding,
error,
@@ -23,6 +23,7 @@
wdirfilenodeids,
wdirhex,
)
+from .pycompat import open
from . import (
copies,
dagop,
@@ -22,6 +22,7 @@
wdirhex,
wdirrev,
)
+from .pycompat import open
from . import (
archival,
bookmarks,
@@ -19,6 +19,7 @@
nullrev,
short,
)
+from .pycompat import open
from . import (
bookmarks,
@@ -18,6 +18,7 @@
nullrev,
short,
)
+from .pycompat import open
from . import (
error,
@@ -17,6 +17,7 @@
from .i18n import _
from .node import nullrev
+from .pycompat import open
from . import (
error,
@@ -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.
@@ -18,6 +18,7 @@
import os
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
bundlerepo,
cmdutil,
@@ -15,6 +15,7 @@
import tempfile
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
node,
@@ -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,
@@ -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,
@@ -9,6 +9,7 @@
from mercurial.i18n import _
from mercurial.node import bin, hex
+from mercurial.pycompat import open
from mercurial import (
error,
pycompat,
@@ -9,6 +9,7 @@
import time
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
node as nodemod,
policy,
@@ -132,6 +132,7 @@
from mercurial.node import hex
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
changegroup,
changelog,
@@ -12,6 +12,7 @@
import stat
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
hg,
@@ -18,6 +18,7 @@
import re
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
config,
error,
@@ -24,6 +24,7 @@
nullrev,
short,
)
+from mercurial.pycompat import open
from mercurial import (
bookmarks,
cmdutil,
@@ -83,6 +83,7 @@
import socket
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
cmdutil,
commands,
@@ -76,6 +76,7 @@
nullrev,
short,
)
+from mercurial.pycompat import open
from mercurial import (
cmdutil,
commands,
@@ -8,6 +8,7 @@
import re
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
@@ -14,6 +14,8 @@
from mercurial.i18n import _
+from mercurial.pycompat import open
+
from mercurial.hgweb import webcommands
from mercurial import (
@@ -10,6 +10,7 @@
from __future__ import absolute_import
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import util
from . import (
@@ -16,6 +16,7 @@
from mercurial.i18n import _
from mercurial.node import hex
+from mercurial.pycompat import open
from mercurial import (
dirstate,
@@ -11,6 +11,7 @@
import subprocess
import tempfile
+from mercurial.pycompat import open
from mercurial import (
node,
pycompat,
@@ -103,6 +103,8 @@
from mercurial.i18n import _
+from mercurial.pycompat import open
+
from mercurial.utils import (
procutil,
stringutil,
@@ -206,6 +206,7 @@
import struct
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
bundle2,
cmdutil,
@@ -117,7 +117,7 @@
from mercurial.i18n import _
from mercurial.node import hex
-
+from mercurial.pycompat import open
from mercurial import (
context,
encoding,
@@ -13,6 +13,7 @@
import struct
from mercurial.node import hex
+from mercurial.pycompat import open
from mercurial import (
error as hgerror,
pycompat,
@@ -10,6 +10,7 @@
import os
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
extensions,
@@ -13,6 +13,7 @@
import os
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
linelog as linelogmod,
@@ -8,6 +8,7 @@
import xml.dom.minidom
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
encoding,
error,
@@ -11,6 +11,7 @@
import re
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
error,
pycompat,
@@ -23,6 +23,7 @@
import time
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
bookmarks,
context,
@@ -11,6 +11,7 @@
import re
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
encoding,
error,
@@ -12,6 +12,7 @@
import socket
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
encoding,
error,
@@ -11,6 +11,7 @@
import shutil
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
encoding,
error,
@@ -15,6 +15,7 @@
import subprocess
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
encoding,
error,
@@ -15,6 +15,7 @@
import time
from mercurial.i18n import _
+from mercurial.pycompat import open
from mercurial import (
cmdutil,
encoding,