# HG changeset patch # User Pierre-Yves David # Date 1675355785 -3600 # Node ID d1502345f89c16c0c6867cc85da9d0948545f091 # Parent b73bae3520b88d0d8293f8840941642a4aafdd82 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. diff -r b73bae3520b8 -r d1502345f89c mercurial/strip.py --- a/mercurial/strip.py Thu Feb 02 17:36:15 2023 +0100 +++ b/mercurial/strip.py Thu Feb 02 17:36:25 2023 +0100 @@ -36,7 +36,7 @@ currentbranch = repo[None].branch() if ( - util.safehasattr(repo, b'mq') + util.safehasattr(repo, 'mq') and p2 != repo.nullid and p2 in [x.node for x in repo.mq.applied] ):