This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6743

perf: handle NameError for `pycompat.foo` when pycompat wasn't imported
ClosedPublic

Authored by martinvonz on Aug 19 2019, 1:43 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc8d3af9c7e65: perf: handle NameError for `pycompat.foo` when pycompat wasn't imported
rHGfd62b027d6a4: perf: handle NameError for `pycompat.foo` when pycompat wasn't imported
Summary

On old Mercurial versions, we won't have a pycompat variable defined,
and then pycompat.foo will raise a NameError.

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.

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (6 lines)

Diff 16272

contrib/perf.py

_byteskwargs = pycompat.byteskwargs # since 4.1 (or fbc3f73dc802) _byteskwargs = pycompat.byteskwargs # since 4.1 (or fbc3f73dc802)
_sysstr = pycompat.sysstr # since 4.0 (or 2219f4f82ede) _sysstr = pycompat.sysstr # since 4.0 (or 2219f4f82ede)
_xrange = pycompat.xrange # since 4.8 (or 7eba8f83129b) _xrange = pycompat.xrange # since 4.8 (or 7eba8f83129b)
fsencode = pycompat.fsencode # since 3.9 (or f4a5e0e86a7e) fsencode = pycompat.fsencode # since 3.9 (or f4a5e0e86a7e)
if pycompat.ispy3: if pycompat.ispy3:
_maxint = sys.maxsize # per py3 docs for replacing maxint _maxint = sys.maxsize # per py3 docs for replacing maxint
else: else:
_maxint = sys.maxint _maxint = sys.maxint
except (ImportError, AttributeError): except (NameError, ImportError, AttributeError):
import inspect import inspect
getargspec = inspect.getargspec getargspec = inspect.getargspec
_byteskwargs = identity _byteskwargs = identity
fsencode = identity # no py3 support fsencode = identity # no py3 support
_maxint = sys.maxint # no py3 support _maxint = sys.maxint # no py3 support
_sysstr = lambda x: x # no py3 support _sysstr = lambda x: x # no py3 support
_xrange = xrange _xrange = xrange
try: try:
# 4.7+ # 4.7+
queue = pycompat.queue.Queue queue = pycompat.queue.Queue
except (AttributeError, ImportError): except (NameError, AttributeError, ImportError):
# <4.7. # <4.7.
try: try:
queue = pycompat.queue queue = pycompat.queue
except (AttributeError, ImportError): except (NameError, AttributeError, ImportError):
queue = util.queue queue = util.queue
try: try:
from mercurial import logcmdutil from mercurial import logcmdutil
makelogtemplater = logcmdutil.maketemplater makelogtemplater = logcmdutil.maketemplater
except (AttributeError, ImportError): except (AttributeError, ImportError):
try: try:
makelogtemplater = cmdutil.makelogtemplater makelogtemplater = cmdutil.makelogtemplater