This is an archive of the discontinued Mercurial Phabricator instance.

Differential D295

extensions: attempt to use non-deprecated inspect method
ClosedPublic

Authored by durin42 on Aug 9 2017, 10:24 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG62fbe95075d3: extensions: attempt to use non-deprecated inspect method
Summary

Avoids some deprecation warnings when extension loading breaks.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (6 lines)

Diff 678

mercurial/extensions.py

def _runextsetup(name, ui): def _runextsetup(name, ui):
extsetup = getattr(_extensions[name], 'extsetup', None) extsetup = getattr(_extensions[name], 'extsetup', None)
if extsetup: if extsetup:
try: try:
try: try:
extsetup(ui) extsetup(ui)
except TypeError: except TypeError:
if inspect.getargspec(extsetup).args: # Try to use getfullargspec (Python 3) first, and fall
# back to getargspec only if it doesn't exist so as to
# avoid warnings.
if getattr(inspect, 'getfullargspec',
getattr(inspect, 'getargspec'))(extsetup).args:
raise raise
extsetup() # old extsetup with no ui argument extsetup() # old extsetup with no ui argument
except Exception as inst: except Exception as inst:
ui.traceback() ui.traceback()
msg = util.forcebytestr(inst) msg = util.forcebytestr(inst)
ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg)) ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg))
return False return False
return True return True