safehasattr: pass attribute name as string instead of bytes
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 02 Feb 2023 17:32:38 +0100
changeset 50589 362d5a2ffd17
parent 50588 0ec94359eae8
child 50590 1c810421a82f
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/mdiff.py
--- a/mercurial/mdiff.py	Thu Feb 02 17:30:50 2023 +0100
+++ b/mercurial/mdiff.py	Thu Feb 02 17:32:38 2023 +0100
@@ -213,7 +213,7 @@
     if (
         opts is None
         or not opts.xdiff
-        or not util.safehasattr(bdiff, b'xdiffblocks')
+        or not util.safehasattr(bdiff, 'xdiffblocks')
     ):
         return bdiff.blocks
     else: