diff options
Diffstat (limited to 'astroid/brain')
| -rw-r--r-- | astroid/brain/brain_builtin_inference.py | 10 | ||||
| -rw-r--r-- | astroid/brain/brain_gi.py | 4 | ||||
| -rw-r--r-- | astroid/brain/brain_six.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/astroid/brain/brain_builtin_inference.py b/astroid/brain/brain_builtin_inference.py index c6245be..eb61b70 100644 --- a/astroid/brain/brain_builtin_inference.py +++ b/astroid/brain/brain_builtin_inference.py @@ -5,8 +5,8 @@ import sys from textwrap import dedent import six -from astroid import (MANAGER, UseInferenceDefault, NotFoundError, - inference_tip, InferenceError, UnresolvableName) +from astroid import (MANAGER, UseInferenceDefault, AttributeInferenceError, + inference_tip, InferenceError, NameInferenceError) from astroid import arguments from astroid.builder import AstroidBuilder from astroid import helpers @@ -193,7 +193,7 @@ def _get_elts(arg, context): (nodes.List, nodes.Tuple, nodes.Set)) try: inferred = next(arg.infer(context)) - except (InferenceError, UnresolvableName): + except (InferenceError, NameInferenceError): raise UseInferenceDefault() if isinstance(inferred, nodes.Dict): items = inferred.items @@ -356,7 +356,7 @@ def infer_getattr(node, context=None): try: return next(obj.igetattr(attr, context=context)) - except (StopIteration, InferenceError, NotFoundError): + except (StopIteration, InferenceError, AttributeInferenceError): if len(node.args) == 3: # Try to infer the default and return it instead. try: @@ -384,7 +384,7 @@ def infer_hasattr(node, context=None): except UseInferenceDefault: # Can't infer something from this function call. return util.YES - except NotFoundError: + except AttributeInferenceError: # Doesn't have it. return nodes.Const(False) return nodes.Const(True) diff --git a/astroid/brain/brain_gi.py b/astroid/brain/brain_gi.py index f8acb42..0860207 100644 --- a/astroid/brain/brain_gi.py +++ b/astroid/brain/brain_gi.py @@ -114,7 +114,7 @@ def _gi_build_stub(parent): def _import_gi_module(modname): # we only consider gi.repository submodules if not modname.startswith('gi.repository.'): - raise AstroidBuildingException() + raise AstroidBuildingException(modname=modname) # build astroid representation unless we already tried so if modname not in _inspected_modules: modnames = [modname] @@ -155,7 +155,7 @@ def _import_gi_module(modname): else: astng = _inspected_modules[modname] if astng is None: - raise AstroidBuildingException('Failed to import module %r' % modname) + raise AstroidBuildingException(modname=modname) return astng def _looks_like_require_version(node): diff --git a/astroid/brain/brain_six.py b/astroid/brain/brain_six.py index a1043ea..3b2b945 100644 --- a/astroid/brain/brain_six.py +++ b/astroid/brain/brain_six.py @@ -254,7 +254,7 @@ def six_moves_transform(): def _six_fail_hook(modname): if modname != 'six.moves': - raise AstroidBuildingException + raise AstroidBuildingException(modname=modname) module = AstroidBuilder(MANAGER).string_build(_IMPORTS) module.name = 'six.moves' return module |