Mercurial > public > mercurial-scm > hg

diff mercurial/templatefilters.py @ 50925:d718eddf01d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
safehasattr: drop usage in favor of hasattr The two functions should now be equivalent at least in their usage in core.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 31 Aug 2023 23:56:15 +0200
parents 90945014f4e4
children f4733654f144
line wrap: on
line diff
--- a/mercurial/templatefilters.py	Thu Dec 08 15:33:19 2022 +0100
+++ b/mercurial/templatefilters.py	Thu Aug 31 23:56:15 2023 +0200
@@ -339,14 +339,14 @@
         raise error.ProgrammingError(
             b'Mercurial only does output with bytes: %r' % obj
         )
-    elif util.safehasattr(obj, 'keys'):
+    elif hasattr(obj, 'keys'):
         out = [
             b'"%s": %s'
             % (encoding.jsonescape(k, paranoid=paranoid), json(v, paranoid))
             for k, v in sorted(obj.items())
         ]
         return b'{' + b', '.join(out) + b'}'
-    elif util.safehasattr(obj, '__iter__'):
+    elif hasattr(obj, '__iter__'):
         out = [json(i, paranoid) for i in obj]
         return b'[' + b', '.join(out) + b']'
     raise error.ProgrammingError(b'cannot encode %r' % obj)