Add typing to NodeNG._infer and associated nodes (#1541)

Author: DanielNoord

astroid/inference.py

@@ -48,7 +48,13 @@
 # .infer method ###############################################################
 
 
-def infer_end(self, context=None):
+_T = TypeVar("_T")
+_BaseContainerT = TypeVar("_BaseContainerT", bound=nodes.BaseContainer)
+
+
+def infer_end(
+    self: _T, context: InferenceContext | None = None, **kwargs: Any
+) -> Iterator[_T]:
     """Inference's end for nodes that yield themselves on inference
 
     These are objects for which inference does not have any semantic,
@@ -57,7 +63,7 @@ def infer_end(self, context=None):
     yield self
 
 
-# We add ignores to all these assignments in this file
+# We add ignores to all assignments to methods
 # See https://github.com/python/mypy/issues/2427
 nodes.Module._infer = infer_end  # type: ignore[assignment]
 nodes.ClassDef._infer = infer_end  # type: ignore[assignment]
@@ -89,7 +95,11 @@ def _infer_sequence_helper(node, context=None):
 
 
 @decorators.raise_if_nothing_inferred
-def infer_sequence(self, context=None):
+def infer_sequence(
+    self: _BaseContainerT,
+    context: InferenceContext | None = None,
+    **kwargs: Any,
+) -> Iterator[_BaseContainerT]:
     has_starred_named_expr = any(
         isinstance(e, (nodes.Starred, nodes.NamedExpr)) for e in self.elts
     )

astroid/nodes/node_classes.py

@@ -4876,7 +4876,7 @@ def __init__(
         )
 
     def _infer(
-        self, context: InferenceContext | None = None
+        self, context: InferenceContext | None = None, **kwargs: Any
     ) -> Iterator[NodeNG | type[util.Uninferable]]:
         yield self.value
 

astroid/nodes/node_ng.py

@@ -594,7 +594,9 @@ def _infer_name(self, frame, name):
         # overridden for ImportFrom, Import, Global, TryExcept and Arguments
         pass
 
-    def _infer(self, context=None):
+    def _infer(
+        self, context: InferenceContext | None = None, **kwargs: Any
+    ) -> Iterator[NodeNG | type[util.Uninferable] | bases.Instance]:
         """we don't know how to resolve a statement by default"""
         # this method is overridden by most concrete classes
         raise InferenceError(

astroid/objects.py

@@ -15,7 +15,7 @@
 
 import sys
 from collections.abc import Iterator
-from typing import TypeVar
+from typing import Any, TypeVar
 
 from astroid import bases, decorators, util
 from astroid.context import InferenceContext
@@ -44,7 +44,7 @@ class FrozenSet(node_classes.BaseContainer):
     def pytype(self):
         return "builtins.frozenset"
 
-    def _infer(self, context=None):
+    def _infer(self, context=None, **kwargs: Any):
         yield self
 
     @cached_property
@@ -77,7 +77,7 @@ def __init__(self, mro_pointer, mro_type, self_class, scope):
         self._scope = scope
         super().__init__()
 
-    def _infer(self, context=None):
+    def _infer(self, context=None, **kwargs: Any):
         yield self
 
     def super_mro(self):
@@ -331,5 +331,7 @@ def pytype(self):
     def infer_call_result(self, caller=None, context=None):
         raise InferenceError("Properties are not callable")
 
-    def _infer(self: _T, context: InferenceContext | None = None) -> Iterator[_T]:
+    def _infer(
+        self: _T, context: InferenceContext | None = None, **kwargs: Any
+    ) -> Iterator[_T]:
         yield self