safehasattr: pass attribute name as string instead of bytes
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 02 Feb 2023 17:28:40 +0100
changeset 50585 2d9ba65a4d0a
parent 50584 b2ec43d552d4
child 50586 58e58ea3dcb8
safehasattr: pass attribute name as string instead of bytes This is a step toward replacing `util.safehasattr` usage with plain `hasattr`. The builtin function behave poorly in Python2 but this was fixed in Python3. These change are done one by one as they tend to have a small odd to trigger puzzling breackage.
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Feb 02 17:28:30 2023 +0100
+++ b/mercurial/localrepo.py	Thu Feb 02 17:28:40 2023 +0100
@@ -1518,8 +1518,8 @@
             repo = rref()
             if (
                 repo is None
-                or not util.safehasattr(repo, b'_wlockref')
-                or not util.safehasattr(repo, b'_lockref')
+                or not util.safehasattr(repo, '_wlockref')
+                or not util.safehasattr(repo, '_lockref')
             ):
                 return
             if mode in (None, b'r', b'rb'):