This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1065

python3: move from using func_name to __name__
ClosedPublic

Authored by durin42 on Oct 14 2017, 3:03 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG56bb07a0b75c: python3: move from using func_name to __name__
Summary

Previously reviewed as D964, but required some fixups and therefore
seems to need a new revision.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 14 2017, 3:03 AM
yuja accepted this revision.Oct 14 2017, 7:28 AM
This revision is now accepted and ready to land.Oct 14 2017, 7:28 AM
Closed by commit rHG56bb07a0b75c: python3: move from using func_name to __name__ (authored by durin42). · Explain WhyOct 14 2017, 7:47 AM
This revision was automatically updated to reflect the committed changes.
yuja added a comment.Oct 14 2017, 7:48 AM

This is queued, but we'll need to wrap name with sysbytes() for py3.

Revision Contents
Changeset List

PathPackages
Mmercurial/peer.py (2 lines)
Mmercurial/templater.py (4 lines)

Diff 2731

mercurial/peer.py

decoding phases. decoding phases.
''' '''
def plain(*args, **opts): def plain(*args, **opts):
batchable = f(*args, **opts) batchable = f(*args, **opts)
encargsorres, encresref = next(batchable) encargsorres, encresref = next(batchable)
if not encresref: if not encresref:
return encargsorres # a local result in this case return encargsorres # a local result in this case
self = args[0] self = args[0]
encresref.set(self._submitone(f.func_name, encargsorres)) encresref.set(self._submitone(f.__name__, encargsorres))
return next(batchable) return next(batchable)
setattr(plain, 'batchable', f) setattr(plain, 'batchable', f)
return plain return plain

mercurial/templater.py

arg, filt = data arg, filt = data
thing = evalfuncarg(context, mapping, arg) thing = evalfuncarg(context, mapping, arg)
try: try:
return filt(thing) return filt(thing)
except (ValueError, AttributeError, TypeError): except (ValueError, AttributeError, TypeError):
sym = findsymbolicname(arg) sym = findsymbolicname(arg)
if sym: if sym:
msg = (_("template filter '%s' is not compatible with keyword '%s'") msg = (_("template filter '%s' is not compatible with keyword '%s'")
% (filt.func_name, sym)) % (filt.__name__, sym))
else: else:
msg = _("incompatible use of template filter '%s'") % filt.func_name msg = _("incompatible use of template filter '%s'") % filt.__name__
raise error.Abort(msg) raise error.Abort(msg)
def buildmap(exp, context): def buildmap(exp, context):
darg = compileexp(exp[1], context, methods) darg = compileexp(exp[1], context, methods)
targ = gettemplate(exp[2], context) targ = gettemplate(exp[2], context)
return (runmap, (darg, targ)) return (runmap, (darg, targ))
def runmap(context, mapping, data): def runmap(context, mapping, data):