Mercurial > hg
changeset 43088:0d612db7047c
py3: stop injecting pycompat.hasattr into modules
I only found a single user of this pattern, probably because we
use util.hasattr everywhere.
Differential Revision: https://phab.mercurial-scm.org/D7008
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 06 Oct 2019 16:39:13 -0400 |
| parents | 66f2cc210a29 |
| children | c59eb1560c44 |
| files | mercurial/__init__.py mercurial/pycompat.py mercurial/statprof.py |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/__init__.py Sun Oct 06 14:58:42 2019 -0400 +++ b/mercurial/__init__.py Sun Oct 06 16:39:13 2019 -0400 @@ -171,7 +171,7 @@ r, c = t.start l = ( b'; from mercurial.pycompat import ' - b'delattr, getattr, hasattr\n' + b'delattr, getattr\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\x0f' + BYTECODEHEADER = b'HG\x00\x10' class hgloader(importlib.machinery.SourceFileLoader): """Custom module loader that transforms source code.
--- a/mercurial/pycompat.py Sun Oct 06 14:58:42 2019 -0400 +++ b/mercurial/pycompat.py Sun Oct 06 16:39:13 2019 -0400 @@ -355,6 +355,7 @@ strurl = identity bytesurl = identity open = open + hasattr = hasattr setattr = setattr # this can't be parsed on Python 3
--- a/mercurial/statprof.py Sun Oct 06 14:58:42 2019 -0400 +++ b/mercurial/statprof.py Sun Oct 06 16:39:13 2019 -0400 @@ -168,7 +168,7 @@ # a float if frequency: self.sample_interval = 1.0 / frequency - elif not hasattr(self, 'sample_interval'): + elif not pycompat.hasattr(self, 'sample_interval'): # default to 1000 Hz self.sample_interval = 1.0 / 1000.0 else: