( )⚙ D964 python3: move from using func_name to __name__

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
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 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 (3 lines)
Mmercurial/pycompat.py (7 lines)
Mmercurial/templater.py (5 lines)

Diff 2525

mercurial/peer.py

# peer.py - repository base classes for mercurial # peer.py - repository base classes for mercurial
# #
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from . import ( from . import (
error, error,
pycompat,
util, util,
) )
# abstract batching support # abstract batching support
class future(object): class future(object):
'''placeholder for a value to be set later''' '''placeholder for a value to be set later'''
def set(self, value): def set(self, value):
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(pycompat.funcname(f), encargsorres))
return next(batchable) return next(batchable)
setattr(plain, 'batchable', f) setattr(plain, 'batchable', f)
return plain return plain

mercurial/pycompat.py

rawinput = input rawinput = input
# TODO: .buffer might not exist if std streams were replaced; we'll need # TODO: .buffer might not exist if std streams were replaced; we'll need
# a silly wrapper to make a bytes stream backed by a unicode one. # a silly wrapper to make a bytes stream backed by a unicode one.
stdin = sys.stdin.buffer stdin = sys.stdin.buffer
stdout = sys.stdout.buffer stdout = sys.stdout.buffer
stderr = sys.stderr.buffer stderr = sys.stderr.buffer
def funcname(func):
return sysbytes(func.__name__)
# Since Python 3 converts argv to wchar_t type by Py_DecodeLocale() on Unix, # Since Python 3 converts argv to wchar_t type by Py_DecodeLocale() on Unix,
# we can use os.fsencode() to get back bytes argv. # we can use os.fsencode() to get back bytes argv.
# #
# https://hg.python.org/cpython/file/v3.5.1/Programs/python.c#l55 # https://hg.python.org/cpython/file/v3.5.1/Programs/python.c#l55
# #
# TODO: On Windows, the native argv is wchar_t, so we'll need a different # TODO: On Windows, the native argv is wchar_t, so we'll need a different
# workaround to simulate the Python 2 (i.e. ANSI Win32 API) behavior. # workaround to simulate the Python 2 (i.e. ANSI Win32 API) behavior.
if getattr(sys, 'argv', None) is not None: if getattr(sys, 'argv', None) is not None:
oslinesep = os.linesep oslinesep = os.linesep
osname = os.name osname = os.name
ospathsep = os.pathsep ospathsep = os.pathsep
ossep = os.sep ossep = os.sep
osaltsep = os.altsep osaltsep = os.altsep
stdin = sys.stdin stdin = sys.stdin
stdout = sys.stdout stdout = sys.stdout
stderr = sys.stderr stderr = sys.stderr
def funcname(func):
return func.func_name
if getattr(sys, 'argv', None) is not None: if getattr(sys, 'argv', None) is not None:
sysargv = sys.argv sysargv = sys.argv
sysplatform = sys.platform sysplatform = sys.platform
getcwd = os.getcwd getcwd = os.getcwd
sysexecutable = sys.executable sysexecutable = sys.executable
shlexsplit = shlex.split shlexsplit = shlex.split
stringio = cStringIO.StringIO stringio = cStringIO.StringIO
maplist = map maplist = map
rawinput = raw_input rawinput = raw_input

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)) % (pycompat.funcname(filt), sym))
else: else:
msg = _("incompatible use of template filter '%s'") % filt.func_name msg = _("incompatible use of template filter '%s'") % (
pycompat.funcname(filt))
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):