This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7385

debugcommands: suppress import errors for pytype
ClosedPublic

Authored by durin42 on Nov 13 2019, 10:51 PM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa9b14ef701d1: debugcommands: suppress import errors for pytype

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.Nov 13 2019, 10:51 PM
dlax accepted this revision.Nov 14 2019, 5:02 AM
dlax added a subscriber: dlax.

I wonder if using importlib.import_module() wouldn't help. Or is it something we avoid in Mercurial?

durin42 added a comment.Nov 14 2019, 4:16 PM
In D7385#108592, @dlax wrote:

I wonder if using importlib.import_module() wouldn't help. Or is it something we avoid in Mercurial?

We use it in other places. I have no idea the extent to which it'd help.

durin42 updated this revision to Diff 18157.Nov 15 2019, 11:32 AM
indygreg accepted this revision.Nov 18 2019, 10:44 PM
This revision is now accepted and ready to land.Nov 18 2019, 10:44 PM
durin42 added a commit: rHGa9b14ef701d1: debugcommands: suppress import errors for pytype.Nov 18 2019, 10:50 PM
Closed by commit rHGa9b14ef701d1: debugcommands: suppress import errors for pytype (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (4 lines)

Diff 18226

mercurial/debugcommands.py

rustandc = policy.policy in (b'rust+c', b'rust+c-allow') rustandc = policy.policy in (b'rust+c', b'rust+c-allow')
rustext = rustandc # for now, that's the only case rustext = rustandc # for now, that's the only case
cext = policy.policy in (b'c', b'allow') or rustandc cext = policy.policy in (b'c', b'allow') or rustandc
nopure = cext or rustext nopure = cext or rustext
if nopure: if nopure:
err = None err = None
try: try:
if cext: if cext:
from .cext import ( from .cext import ( # pytype: disable=import-error
base85, base85,
bdiff, bdiff,
mpatch, mpatch,
osutil, osutil,
) )
# quiet pyflakes # quiet pyflakes
dir(bdiff), dir(mpatch), dir(base85), dir(osutil) dir(bdiff), dir(mpatch), dir(base85), dir(osutil)
if rustext: if rustext:
from .rustext import ( from .rustext import ( # pytype: disable=import-error
ancestor, ancestor,
dirstate, dirstate,
) )
dir(ancestor), dir(dirstate) # quiet pyflakes dir(ancestor), dir(dirstate) # quiet pyflakes
except Exception as inst: except Exception as inst:
err = stringutil.forcebytestr(inst) err = stringutil.forcebytestr(inst)
problems += 1 problems += 1