pycompat: drop usage of hasattr/getattr/setattr/delatt proxy

The function remains to ease extensions transition, but we no longer use them in
core.

hgext/convert/cvs.py

@@ -12,7 +12,6 b' import socket'
 
 from mercurial.i18n import _
 from mercurial.pycompat import (
-    getattr,
     open,
 )
 from mercurial import (

hgext/convert/transport.py

@@ -27,8 +27,6 b' import svn.ra'
 Pool = svn.core.Pool
 SubversionException = svn.core.SubversionException
 
-from mercurial.pycompat import getattr
-
 # Some older versions of the Python bindings need to be
 # explicitly initialized. But what we want to do probably
 # won't work worth a darn against those libraries anyway!

hgext/factotum.py

@@ -48,7 +48,6 b' service entry controls the service name '
 
 import os
 from mercurial.i18n import _
-from mercurial.pycompat import setattr
 from mercurial.utils import procutil
 from mercurial import (
     error,

hgext/fastannotate/context.py

@@ -12,9 +12,7 b' import os'
 
 from mercurial.i18n import _
 from mercurial.pycompat import (
-    getattr,
     open,
-    setattr,
 )
 from mercurial.node import (
     bin,

hgext/fastannotate/support.py

@@ -6,7 +6,6 b''
 # GNU General Public License version 2 or any later version.
 
 
-from mercurial.pycompat import getattr
 from mercurial import (
     context as hgcontext,
     dagop,

hgext/histedit.py

@@ -207,7 +207,6 b' import struct'
 
 from mercurial.i18n import _
 from mercurial.pycompat import (
-    getattr,
     open,
 )
 from mercurial.node import (

hgext/keyword.py

@@ -88,7 +88,6 b' import re'
 import weakref
 
 from mercurial.i18n import _
-from mercurial.pycompat import getattr
 from mercurial.hgweb import webcommands
 
 from mercurial import (

hgext/largefiles/storefactory.py

@@ -5,7 +5,6 b''
 import re
 
 from mercurial.i18n import _
-from mercurial.pycompat import getattr
 from mercurial import (
     error,
     hg,

hgext/lfs/blobstore.py

@@ -15,7 +15,6 b' import re'
 import socket
 
 from mercurial.i18n import _
-from mercurial.pycompat import getattr
 from mercurial.node import hex
 
 from mercurial import (

hgext/lfs/wrapper.py

@@ -10,10 +10,6 b' import hashlib'
 
 from mercurial.i18n import _
 from mercurial.node import bin, hex, short
-from mercurial.pycompat import (
-    getattr,
-    setattr,
-)
 
 from mercurial import (
     bundle2,

hgext/mq.py

@@ -75,8 +75,6 b' from mercurial.node import ('
     short,
 )
 from mercurial.pycompat import (
-    delattr,
-    getattr,
     open,
 )
 from mercurial import (

hgext/phabricator.py

@@ -71,7 +71,6 b' import time'
 
 from mercurial.node import bin, short
 from mercurial.i18n import _
-from mercurial.pycompat import getattr
 from mercurial.thirdparty import attr
 from mercurial import (
     cmdutil,

hgext/remotefilelog/basepack.py

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

hgext/remotefilelog/contentstore.py

@@ -4,7 +4,6 b' from mercurial.node import ('
     hex,
     sha1nodeconstants,
 )
-from mercurial.pycompat import getattr
 from mercurial import (
     mdiff,
     revlog,

hgext/sparse.py

@@ -73,7 +73,6 b' certain files::'
 
 
 from mercurial.i18n import _
-from mercurial.pycompat import setattr
 from mercurial import (
     cmdutil,
     commands,

hgext/win32mbcs.py

@@ -49,7 +49,6 b' import os'
 import sys
 
 from mercurial.i18n import _
-from mercurial.pycompat import getattr, setattr
 from mercurial import (
     encoding,
     error,

mercurial/bookmarks.py

@@ -14,7 +14,6 b' from .node import ('
     hex,
     short,
 )
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/chgserver.py

@@ -49,10 +49,6 b' import struct'
 import time
 
 from .i18n import _
-from .pycompat import (
-    getattr,
-    setattr,
-)
 from .node import hex
 
 from . import (

mercurial/cmdutil.py

@@ -28,9 +28,7 b' from .node import ('
     short,
 )
 from .pycompat import (
-    getattr,
     open,
-    setattr,
 )
 from .thirdparty import attr
 

mercurial/color.py

@@ -9,7 +9,6 b''
 import re
 
 from .i18n import _
-from .pycompat import getattr
 
 from . import (
     encoding,

mercurial/commandserver.py

@@ -16,7 +16,6 b' import struct'
 import traceback
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/config.py

@@ -10,7 +10,6 b' import errno'
 import os
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/context.py

@@ -16,9 +16,6 b' from .node import ('
     nullrev,
     short,
 )
-from .pycompat import (
-    getattr,
-)
 from . import (
     dagop,
     encoding,

mercurial/crecord.py

@@ -15,7 +15,6 b' import signal'
 
 from .i18n import _
 from .pycompat import (
-    getattr,
     open,
 )
 from . import (

mercurial/debugcommands.py

@@ -33,7 +33,6 b' from .node import ('
     short,
 )
 from .pycompat import (
-    getattr,
     open,
 )
 from . import (

mercurial/dirstate.py

@@ -13,7 +13,6 b' import stat'
 import uuid
 
 from .i18n import _
-from .pycompat import delattr
 
 from hgdemandimport import tracing
 

mercurial/dispatch.py

@@ -18,7 +18,6 b' import traceback'
 
 
 from .i18n import _
-from .pycompat import getattr
 
 from hgdemandimport import tracing
 

mercurial/encoding.py

@@ -11,7 +11,6 b' import os'
 import re
 import unicodedata
 
-from .pycompat import getattr
 from . import (
     error,
     policy,

mercurial/extensions.py

@@ -19,9 +19,7 b' from .i18n import ('
     gettext,
 )
 from .pycompat import (
-    getattr,
     open,
-    setattr,
 )
 
 from . import (

mercurial/filemerge.py

@@ -16,9 +16,6 b' from .node import ('
     hex,
     short,
 )
-from .pycompat import (
-    getattr,
-)
 
 from . import (
     encoding,

mercurial/fileset.py

@@ -9,7 +9,6 b''
 import re
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     error,
     filesetlang,

mercurial/filesetlang.py

@@ -7,7 +7,6 b''
 
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     error,
     parser,

mercurial/help.py

@@ -26,7 +26,6 b' from .i18n import ('
     _,
     gettext,
 )
-from .pycompat import getattr
 from . import (
     cmdutil,
     encoding,

mercurial/hg.py

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

mercurial/hgweb/common.py

@@ -15,7 +15,6 b' import stat'
 
 from ..i18n import _
 from ..pycompat import (
-    getattr,
     open,
 )
 from .. import (

mercurial/hgweb/hgweb_mod.py

@@ -17,7 +17,6 b' from .common import ('
     permhooks,
     statusmessage,
 )
-from ..pycompat import getattr
 
 from .. import (
     encoding,

mercurial/hgweb/server.py

@@ -16,7 +16,6 b' import wsgiref.validate'
 
 from ..i18n import _
 from ..pycompat import (
-    getattr,
     open,
 )
 

mercurial/hgweb/webcommands.py

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

mercurial/hgweb/webutil.py

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

mercurial/hgweb/wsgicgi.py

@@ -11,7 +11,6 b''
 
 import os
 
-from ..pycompat import getattr
 from .. import pycompat
 
 from ..utils import procutil

mercurial/hook.py

@@ -12,7 +12,6 b' import os'
 import sys
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     demandimport,
     encoding,

mercurial/httppeer.py

@@ -15,7 +15,6 b' import struct'
 
 from concurrent import futures
 from .i18n import _
-from .pycompat import getattr
 from . import (
     bundle2,
     error,

mercurial/i18n.py

@@ -11,7 +11,6 b' import locale'
 import os
 import sys
 
-from .pycompat import getattr
 from .utils import resourceutil
 from . import (
     encoding,

mercurial/keepalive.py

@@ -90,7 +90,6 b' import sys'
 import threading
 
 from .i18n import _
-from .pycompat import getattr
 from .node import hex
 from . import (
     pycompat,

mercurial/localrepo.py

@@ -28,10 +28,6 b' from .node import ('
     sha1nodeconstants,
     short,
 )
-from .pycompat import (
-    delattr,
-    getattr,
-)
 from . import (
     bookmarks,
     branchmap,

mercurial/lock.py

@@ -15,7 +15,6 b' import time'
 import warnings
 
 from .i18n import _
-from .pycompat import getattr
 
 from . import (
     encoding,

mercurial/lsprof.py

@@ -1,8 +1,6 b''
 import _lsprof
 import sys
 
-from .pycompat import getattr
-
 Profiler = _lsprof.Profiler
 
 # PyPy doesn't expose profiler_entry from the module.

mercurial/mail.py

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

mercurial/manifest.py

@@ -17,7 +17,6 b' from .node import ('
     hex,
     nullrev,
 )
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/mdiff.py

@@ -11,10 +11,6 b' import struct'
 import zlib
 
 from .i18n import _
-from .pycompat import (
-    getattr,
-    setattr,
-)
 from . import (
     diffhelper,
     encoding,

mercurial/narrowspec.py

@@ -8,7 +8,6 b''
 import weakref
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     error,
     match as matchmod,

mercurial/obsolete.py

@@ -73,7 +73,6 b' import struct'
 import weakref
 
 from .i18n import _
-from .pycompat import getattr
 from .node import (
     bin,
     hex,

mercurial/phases.py

@@ -111,10 +111,6 b' from .node import ('
     short,
     wdirrev,
 )
-from .pycompat import (
-    getattr,
-    setattr,
-)
 from . import (
     error,
     pycompat,

mercurial/policy.py

@@ -9,8 +9,6 b''
 import os
 import sys
 
-from .pycompat import getattr
-
 # Rules for how modules can be loaded. Values are:
 #
 #    c - require C extensions

mercurial/posix.py

@@ -36,7 +36,6 b' from typing import ('
 
 from .i18n import _
 from .pycompat import (
-    getattr,
     open,
 )
 from . import (

mercurial/profiling.py

@@ -10,7 +10,6 b' import contextlib'
 
 from .i18n import _
 from .pycompat import (
-    getattr,
     open,
 )
 from . import (

mercurial/pure/osutil.py

@@ -11,7 +11,6 b' import ctypes.util'
 import os
 import stat as statmod
 
-from ..pycompat import getattr
 from .. import (
     encoding,
     pycompat,

mercurial/repoview.py

@@ -15,11 +15,6 b' from .node import ('
     hex,
     nullrev,
 )
-from .pycompat import (
-    delattr,
-    getattr,
-    setattr,
-)
 from . import (
     error,
     obsolete,

mercurial/revlog.py

@@ -32,7 +32,6 b' from .node import ('
     wdirrev,
 )
 from .i18n import _
-from .pycompat import getattr
 from .revlogutils.constants import (
     ALL_KINDS,
     CHANGELOGV2,

mercurial/revlogutils/deltas.py

@@ -14,7 +14,6 b' import struct'
 # import stuff from node for others to import from revlog
 from ..node import nullrev
 from ..i18n import _
-from ..pycompat import getattr
 
 from .constants import (
     COMP_MODE_DEFAULT,

mercurial/revset.py

@@ -12,7 +12,6 b' import random'
 import re
 
 from .i18n import _
-from .pycompat import getattr
 from .node import (
     bin,
     nullrev,

mercurial/revsetlang.py

@@ -9,7 +9,6 b''
 import string
 
 from .i18n import _
-from .pycompat import getattr
 from .node import hex
 from . import (
     error,

mercurial/scmposix.py

@@ -9,7 +9,6 b' from typing import ('
     Tuple,
 )
 
-from .pycompat import getattr
 from . import (
     encoding,
     pycompat,

mercurial/scmutil.py

@@ -23,7 +23,6 b' from .node import ('
     short,
     wdirrev,
 )
-from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     copies as copiesmod,

mercurial/smartset.py

@@ -6,7 +6,6 b''
 # GNU General Public License version 2 or any later version.
 
 
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/sshpeer.py

@@ -10,7 +10,6 b' import re'
 import uuid
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     error,
     pycompat,

mercurial/sslutil.py

@@ -15,7 +15,6 b' import ssl'
 import warnings
 
 from .i18n import _
-from .pycompat import getattr
 from .node import hex
 from . import (
     encoding,

mercurial/statprof.py

@@ -167,7 +167,7 b' class ProfileState:'
         # a float
         if frequency:
             self.sample_interval = 1.0 / frequency
-        elif not pycompat.hasattr(self, 'sample_interval'):
+        elif not hasattr(self, 'sample_interval'):
             # default to 1000 Hz
             self.sample_interval = 1.0 / 1000.0
         else:

mercurial/store.py

@@ -13,7 +13,6 b' import stat'
 from typing import Generator, List
 
 from .i18n import _
-from .pycompat import getattr
 from .thirdparty import attr
 from .node import hex
 from .revlogutils.constants import (

mercurial/strip.py

@@ -1,5 +1,4 b''
 from .i18n import _
-from .pycompat import getattr
 from . import (
     bookmarks as bookmarksmod,
     cmdutil,

mercurial/subrepoutil.py

@@ -11,7 +11,6 b' import posixpath'
 import re
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     config,
     error,

mercurial/templater.py

@@ -72,7 +72,6 b' import os'
 from .i18n import _
 from .pycompat import (
     FileNotFoundError,
-    getattr,
 )
 from . import (
     config,

mercurial/templateutil.py

@@ -10,7 +10,6 b' import abc'
 import types
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     error,
     pycompat,

mercurial/testing/storage.py

@@ -12,7 +12,6 b' from ..node import ('
     hex,
     nullrev,
 )
-from ..pycompat import getattr
 from .. import (
     error,
     mdiff,

mercurial/ui.py

@@ -37,7 +37,6 b' from typing import ('
 from .i18n import _
 from .node import hex
 from .pycompat import (
-    getattr,
     open,
 )
 

mercurial/unionrepo.py

@@ -13,7 +13,6 b' allowing operations like diff and log wi'
 
 
 from .i18n import _
-from .pycompat import getattr
 
 from . import (
     changelog,

mercurial/upgrade_utils/engine.py

@@ -9,7 +9,6 b''
 import stat
 
 from ..i18n import _
-from ..pycompat import getattr
 from .. import (
     error,
     metadata,

mercurial/urllibcompat.py

@@ -11,7 +11,6 b' import urllib.parse'
 import urllib.request
 import urllib.response
 
-from .pycompat import getattr
 from . import pycompat
 
 _sysstr = pycompat.sysstr

mercurial/util.py

@@ -37,10 +37,7 b' import warnings'
 from .node import hex
 from .thirdparty import attr
 from .pycompat import (
-    delattr,
-    getattr,
     open,
-    setattr,
 )
 from hgdemandimport import tracing
 from . import (

mercurial/utils/compression.py

@@ -8,7 +8,6 b' import bz2'
 import collections
 import zlib
 
-from ..pycompat import getattr
 from .. import (
     error,
     i18n,

mercurial/utils/procutil.py

@@ -24,7 +24,6 b' from typing import ('
 
 from ..i18n import _
 from ..pycompat import (
-    getattr,
     open,
 )
 

mercurial/utils/urlutil.py

@@ -9,10 +9,6 b' import re as remod'
 import socket
 
 from ..i18n import _
-from ..pycompat import (
-    getattr,
-    setattr,
-)
 from .. import (
     encoding,
     error,

mercurial/vfs.py

@@ -16,11 +16,6 b' from typing import ('
 )
 
 from .i18n import _
-from .pycompat import (
-    delattr,
-    getattr,
-    setattr,
-)
 from . import (
     encoding,
     error,

mercurial/windows.py

@@ -33,7 +33,6 b' from typing import ('
 )
 
 from .i18n import _
-from .pycompat import getattr
 from . import (
     encoding,
     error,

mercurial/wireprotoframing.py

@@ -14,7 +14,6 b' import collections'
 import struct
 
 from .i18n import _
-from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     encoding,

mercurial/wireprototypes.py

@@ -9,7 +9,6 b' from .node import ('
     hex,
 )
 from .i18n import _
-from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     error,

mercurial/wireprotov1peer.py

@@ -12,10 +12,6 b' import weakref'
 from concurrent import futures
 from .i18n import _
 from .node import bin
-from .pycompat import (
-    getattr,
-    setattr,
-)
 from . import (
     bundle2,
     changegroup as changegroupmod,

mercurial/wireprotov1server.py

@@ -11,7 +11,6 b' import os'
 
 from .i18n import _
 from .node import hex
-from .pycompat import getattr
 
 from . import (
     bundle2,