@@ -15,6 +15,7 @@
hex,
nullid,
)
+from .pycompat import getattr
from . import (
bundle2,
@@ -13,7 +13,10 @@
from .i18n import _
from .node import bin
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
bundle2,
changegroup as changegroupmod,
@@ -10,6 +10,7 @@
hex,
)
from .i18n import _
+from .pycompat import getattr
from .thirdparty import attr
from . import (
error,
@@ -15,6 +15,7 @@
import struct
from .i18n import _
+from .pycompat import getattr
from .thirdparty import attr
from . import (
encoding,
@@ -16,6 +16,7 @@
import sys
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -14,7 +14,10 @@
import threading
from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
encoding,
error,
@@ -20,7 +20,10 @@
import time
from ..i18n import _
-from ..pycompat import open
+from ..pycompat import (
+ getattr,
+ open,
+)
from .. import (
encoding,
@@ -10,6 +10,7 @@
import collections
import zlib
+from ..pycompat import getattr
from .. import (
error,
i18n,
@@ -36,6 +36,7 @@
from .thirdparty import attr
from .pycompat import (
+ getattr,
open,
setattr,
)
@@ -6,6 +6,7 @@
# 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
@@ -15,6 +15,7 @@
import sys
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -10,6 +10,7 @@
import stat
from .i18n import _
+from .pycompat import getattr
from . import (
changelog,
error,
@@ -14,6 +14,7 @@
from __future__ import absolute_import
from .i18n import _
+from .pycompat import getattr
from . import (
changelog,
@@ -23,6 +23,7 @@
from .i18n import _
from .node import hex
from .pycompat import (
+ getattr,
open,
setattr,
)
@@ -14,6 +14,7 @@
nullid,
nullrev,
)
+from ..pycompat import getattr
from .. import (
error,
mdiff,
@@ -11,6 +11,7 @@
import types
from .i18n import _
+from .pycompat import getattr
from . import (
error,
pycompat,
@@ -68,6 +68,7 @@
import os
from .i18n import _
+from .pycompat import getattr
from . import (
config,
encoding,
@@ -13,6 +13,7 @@
import re
from .i18n import _
+from .pycompat import getattr
from . import (
config,
error,
@@ -14,6 +14,7 @@
import stat
from .i18n import _
+from .pycompat import getattr
from . import (
changelog,
error,
@@ -15,6 +15,7 @@
import ssl
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -11,6 +11,7 @@
import uuid
from .i18n import _
+from .pycompat import getattr
from . import (
error,
pycompat,
@@ -7,6 +7,7 @@
from __future__ import absolute_import
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -26,6 +26,7 @@
wdirid,
wdirrev,
)
+from .pycompat import getattr
from . import (
copies as copiesmod,
@@ -6,6 +6,7 @@
import os
import sys
+from .pycompat import getattr
from . import (
encoding,
pycompat,
@@ -10,6 +10,7 @@
import string
from .i18n import _
+from .pycompat import getattr
from . import (
error,
node,
@@ -10,6 +10,7 @@
import re
from .i18n import _
+from .pycompat import getattr
from . import (
dagop,
destutil,
@@ -15,6 +15,7 @@
# 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,
@@ -35,6 +35,7 @@
wdirrev,
)
from .i18n import _
+from .pycompat import getattr
from .revlogutils.constants import (
FLAG_GENERALDELTA,
FLAG_INLINE_DATA,
@@ -12,7 +12,10 @@
import weakref
from .node import nullrev
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
obsolete,
phases,
@@ -355,6 +355,7 @@
strurl = identity
bytesurl = identity
open = open
+ getattr = getattr
hasattr = hasattr
setattr = setattr
@@ -13,6 +13,7 @@
import socket
import stat as statmod
+from ..pycompat import getattr
from .. import (
encoding,
pycompat,
@@ -10,7 +10,10 @@
import contextlib
from .i18n import _
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
encoding,
error,
@@ -21,7 +21,10 @@
import unicodedata
from .i18n import _
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
encoding,
error,
@@ -10,6 +10,8 @@
import os
import sys
+from .pycompat import getattr
+
# Rules for how modules can be loaded. Values are:
#
# c - require C extensions
@@ -113,7 +113,10 @@
nullrev,
short,
)
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
error,
pycompat,
@@ -74,6 +74,7 @@
import struct
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -8,6 +8,7 @@
from __future__ import absolute_import
from .i18n import _
+from .pycompat import getattr
from .interfaces import repository
from . import (
error,
@@ -12,7 +12,10 @@
import zlib
from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
encoding,
error,
@@ -19,6 +19,7 @@
nullid,
nullrev,
)
+from .pycompat import getattr
from . import (
error,
mdiff,
@@ -19,7 +19,10 @@
import time
from .i18n import _
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
encoding,
error,
@@ -3,6 +3,8 @@
import _lsprof
import sys
+from .pycompat import getattr
+
Profiler = _lsprof.Profiler
# PyPy doesn't expose profiler_entry from the module.
@@ -16,6 +16,7 @@
import warnings
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
@@ -23,6 +23,7 @@
nullrev,
short,
)
+from .pycompat import getattr
from . import (
bookmarks,
branchmap,
@@ -92,6 +92,7 @@
import threading
from .i18n import _
+from .pycompat import getattr
from . import (
node,
pycompat,
@@ -12,6 +12,7 @@
import os
import sys
+from .pycompat import getattr
from . import (
encoding,
pycompat,
@@ -16,6 +16,7 @@
import weakref
from .i18n import _
+from .pycompat import getattr
from . import (
bundle2,
error,
@@ -11,6 +11,7 @@
import sys
from .i18n import _
+from .pycompat import getattr
from . import (
demandimport,
encoding,
@@ -12,6 +12,7 @@
import os
+from ..pycompat import getattr
from .. import pycompat
from ..utils import procutil
@@ -14,6 +14,7 @@
from ..i18n import _
from ..node import hex, short
+from ..pycompat import getattr
from .common import (
ErrorResponse,
@@ -17,7 +17,10 @@
import wsgiref.validate
from ..i18n import _
-from ..pycompat import open
+from ..pycompat import (
+ getattr,
+ open,
+)
from .. import (
encoding,
@@ -18,6 +18,7 @@
permhooks,
statusmessage,
)
+from ..pycompat import getattr
from .. import (
encoding,
@@ -14,7 +14,10 @@
import os
import stat
-from ..pycompat import open
+from ..pycompat import (
+ getattr,
+ open,
+)
from .. import (
encoding,
pycompat,
@@ -16,6 +16,7 @@
from .i18n import _
from .node import nullid
+from .pycompat import getattr
from . import (
bookmarks,
@@ -16,6 +16,7 @@
_,
gettext,
)
+from .pycompat import getattr
from . import (
cmdutil,
encoding,
@@ -8,6 +8,7 @@
from __future__ import absolute_import
from .i18n import _
+from .pycompat import getattr
from . import (
error,
parser,
@@ -11,6 +11,7 @@
import re
from .i18n import _
+from .pycompat import getattr
from . import (
error,
filesetlang,
@@ -18,7 +18,10 @@
nullid,
short,
)
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
encoding,
@@ -19,6 +19,7 @@
gettext,
)
from .pycompat import (
+ getattr,
open,
setattr,
)
@@ -11,6 +11,7 @@
import os
import unicodedata
+from .pycompat import getattr
from . import (
error,
policy,
@@ -20,6 +20,7 @@
from .i18n import _
+from .pycompat import getattr
from hgdemandimport import tracing
@@ -32,7 +32,10 @@
nullrev,
short,
)
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
bundle2,
changegroup,
@@ -16,7 +16,10 @@
import signal
from .i18n import _
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
encoding,
error,
@@ -23,7 +23,10 @@
wdirfilenodeids,
wdirhex,
)
-from .pycompat import open
+from .pycompat import (
+ getattr,
+ open,
+)
from . import (
copies,
dagop,
@@ -11,6 +11,7 @@
import os
from .i18n import _
+from .pycompat import getattr
from . import (
error,
pycompat,
@@ -24,6 +24,7 @@
from .thirdparty import selectors2 as selectors
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -10,6 +10,7 @@
import re
from .i18n import _
+from .pycompat import getattr
from . import (
encoding,
@@ -20,6 +20,7 @@
short,
)
from .pycompat import (
+ getattr,
open,
setattr,
)
@@ -51,7 +51,10 @@
import time
from .i18n import _
-from .pycompat import setattr
+from .pycompat import (
+ getattr,
+ setattr,
+)
from . import (
commandserver,
@@ -17,6 +17,7 @@
short,
wdirid,
)
+from .pycompat import getattr
from . import (
encoding,
error,
@@ -171,7 +171,7 @@
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 @@
# ``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.
@@ -50,7 +50,7 @@
import sys
from mercurial.i18n import _
-from mercurial.pycompat import setattr
+from mercurial.pycompat import getattr, setattr
from mercurial import (
encoding,
error,
@@ -6,6 +6,7 @@
from __future__ import absolute_import
from mercurial.i18n import _
+from mercurial.pycompat import getattr
from mercurial import (
bookmarks as bookmarksmod,
cmdutil,
@@ -3,6 +3,7 @@
import threading
from mercurial.node import hex, nullid
+from mercurial.pycompat import getattr
from mercurial import (
mdiff,
pycompat,
@@ -9,7 +9,10 @@
import time
from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+ getattr,
+ open,
+)
from mercurial import (
node as nodemod,
policy,
@@ -49,6 +49,7 @@
from mercurial.node import bin, nullid
from mercurial.i18n import _
+from mercurial.pycompat import getattr
from mercurial import (
cmdutil,
context,
@@ -76,7 +76,10 @@
nullrev,
short,
)
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+ getattr,
+ open,
+)
from mercurial import (
cmdutil,
commands,
@@ -11,7 +11,10 @@
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,
@@ -16,6 +16,7 @@
import socket
from mercurial.i18n import _
+from mercurial.pycompat import getattr
from mercurial import (
encoding,
@@ -6,7 +6,7 @@
import re
from mercurial.i18n import _
-
+from mercurial.pycompat import getattr
from mercurial import (
error,
hg,
@@ -90,6 +90,7 @@
import weakref
from mercurial.i18n import _
+from mercurial.pycompat import getattr
from mercurial.hgweb import webcommands
from mercurial import (
@@ -103,7 +103,10 @@
from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+ getattr,
+ open,
+)
from mercurial.utils import (
procutil,
@@ -206,7 +206,10 @@
import struct
from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+ getattr,
+ open,
+)
from mercurial import (
bundle2,
cmdutil,
@@ -7,6 +7,7 @@
from __future__ import absolute_import
+from mercurial.pycompat import getattr
from mercurial import (
context as hgcontext,
dagop,
@@ -14,6 +14,7 @@
from mercurial.i18n import _
from mercurial.pycompat import (
+ getattr,
open,
setattr,
)
@@ -25,6 +25,7 @@
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
@@ -12,7 +12,10 @@
import socket
from mercurial.i18n import _
-from mercurial.pycompat import open
+from mercurial.pycompat import (
+ getattr,
+ open,
+)
from mercurial import (
encoding,
error,