Type _infer of Call, Import and ImportFrom (#1653)

Author: DanielNoord

astroid/context.py

@@ -55,22 +55,15 @@ def __init__(self, path=None, nodes_inferred=None):
 
         Currently this key is ``(node, context.lookupname)``
         """
-        self.lookupname = None
-        """
-        :type: optional[str]
-
-        The original name of the node
+        self.lookupname: str | None = None
+        """The original name of the node.
 
         e.g.
         foo = 1
         The inference of 'foo' is nodes.Const(1) but the lookup name is 'foo'
         """
-        self.callcontext = None
-        """
-        :type: optional[CallContext]
-
-        The call arguments and keywords for the given context
-        """
+        self.callcontext: CallContext | None = None
+        """The call arguments and keywords for the given context."""
         self.boundnode = None
         """
         :type: optional[NodeNG]

astroid/inference.py

@@ -241,7 +241,9 @@ def infer_name(
 
 @decorators.raise_if_nothing_inferred
 @decorators.path_wrapper
-def infer_call(self, context=None):
+def infer_call(
+    self: nodes.Call, context: InferenceContext | None = None, **kwargs: Any
+) -> Generator[InferenceResult, None, InferenceErrorInfo]:
     """infer a Call node by trying to guess what the function returns"""
     callcontext = copy_context(context)
     callcontext.boundnode = None
@@ -260,16 +262,23 @@ def infer_call(self, context=None):
                 yield from callee.infer_call_result(caller=self, context=callcontext)
         except InferenceError:
             continue
-    return dict(node=self, context=context)
+    return InferenceErrorInfo(node=self, context=context)
 
 
 nodes.Call._infer = infer_call  # type: ignore[assignment]
 
 
 @decorators.raise_if_nothing_inferred
 @decorators.path_wrapper
-def infer_import(self, context=None, asname=True):
+def infer_import(
+    self: nodes.Import,
+    context: InferenceContext | None = None,
+    asname: bool = True,
+    **kwargs: Any,
+) -> Generator[nodes.Module, None, None]:
     """infer an Import node: return the imported module/object"""
+    if not context:
+        raise InferenceError(node=self, context=context)
     name = context.lookupname
     if name is None:
         raise InferenceError(node=self, context=context)
@@ -283,13 +292,20 @@ def infer_import(self, context=None, asname=True):
         raise InferenceError(node=self, context=context) from exc
 
 
-nodes.Import._infer = infer_import
+nodes.Import._infer = infer_import  # type: ignore[assignment]
 
 
 @decorators.raise_if_nothing_inferred
 @decorators.path_wrapper
-def infer_import_from(self, context=None, asname=True):
+def infer_import_from(
+    self: nodes.ImportFrom,
+    context: InferenceContext | None = None,
+    asname: bool = True,
+    **kwargs: Any,
+) -> Generator[InferenceResult, None, None]:
     """infer a ImportFrom node: return the imported module/object"""
+    if not context:
+        raise InferenceError(node=self, context=context)
     name = context.lookupname
     if name is None:
         raise InferenceError(node=self, context=context)