This is an archive of the discontinued Mercurial Phabricator instance.

Differential D964

python3: move from using func_name to __name__
ClosedPublic

Authored by durin42 on Oct 5 2017, 5:31 PM.

Details

Reviewers
pulkit
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHG68faf082bdcd: python3: add and use adapter for func_name attr, now known as __name__
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 5 2017, 5:31 PM
pulkit accepted this revision.Oct 5 2017, 7:09 PM
indygreg accepted this revision.Oct 6 2017, 9:37 AM
indygreg added a subscriber: indygreg.

Such a brittle pattern. It feels like the names of things should be defined in a decorator or something. But fixing this would be scope bloat and can be punted to another time.

This revision is now accepted and ready to land.Oct 6 2017, 9:37 AM
yuja requested changes to this revision.Oct 6 2017, 11:24 AM
yuja added a subscriber: yuja.

Can't we just use func.__name__ on both Pythons?

This revision now requires changes to proceed.Oct 6 2017, 11:24 AM
Closed by commit rHG68faf082bdcd: python3: add and use adapter for func_name attr, now known as __name__ (authored by durin42). · Explain WhyOct 8 2017, 4:37 AM
This revision was automatically updated to reflect the committed changes.
durin42 retitled this revision from python3: add and use adapter for func_name attr, now known as __name__ to python3: move from using func_name to __name__.Oct 14 2017, 2:52 AM
durin42 updated this revision to Diff 2721.
durin42 added a comment.Oct 14 2017, 2:52 AM

Yep, name is much better.

durin42 added a comment.Oct 14 2017, 3:01 AM

Hm, phabricator still says this is closed. Will make a new revision with the revised code.

Revision Contents
Changeset List

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

Diff 2721

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):