Mercurial > hg
changeset 34693:56bb07a0b75c
python3: move from using func_name to __name__
Previously reviewed as D964, but required some fixups and therefore
seems to need a new revision.
Differential Revision: https://phab.mercurial-scm.org/D1065
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 05 Oct 2017 14:15:05 -0400 |
| parents | 4c322b95a6ab |
| children | 2976cf87a60a |
| files | mercurial/peer.py mercurial/templater.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/peer.py Sat Oct 14 01:20:12 2017 -0400 +++ b/mercurial/peer.py Thu Oct 05 14:15:05 2017 -0400 @@ -90,7 +90,7 @@ if not encresref: return encargsorres # a local result in this case self = args[0] - encresref.set(self._submitone(f.func_name, encargsorres)) + encresref.set(self._submitone(f.__name__, encargsorres)) return next(batchable) setattr(plain, 'batchable', f) return plain
--- a/mercurial/templater.py Sat Oct 14 01:20:12 2017 -0400 +++ b/mercurial/templater.py Thu Oct 05 14:15:05 2017 -0400 @@ -427,9 +427,9 @@ sym = findsymbolicname(arg) if sym: msg = (_("template filter '%s' is not compatible with keyword '%s'") - % (filt.func_name, sym)) + % (filt.__name__, sym)) else: - msg = _("incompatible use of template filter '%s'") % filt.func_name + msg = _("incompatible use of template filter '%s'") % filt.__name__ raise error.Abort(msg) def buildmap(exp, context):