Fix typing of _infer to allow a return value in the Generator

Author: DanielNoord

astroid/bases.py

@@ -10,7 +10,7 @@
 import collections
 import collections.abc
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any
 
 from astroid import decorators
 from astroid.const import PY310_PLUS
@@ -26,7 +26,7 @@
     InferenceError,
     NameInferenceError,
 )
-from astroid.typing import InferenceResult
+from astroid.typing import InferenceErrorInfo, InferenceResult
 from astroid.util import Uninferable, lazy_descriptor, lazy_import
 
 objectmodel = lazy_import("interpreter.objectmodel")
@@ -36,7 +36,6 @@
 if TYPE_CHECKING:
     from astroid import nodes
 
-_ProxyT = TypeVar("_ProxyT", bound="Proxy")
 
 # TODO: check if needs special treatment
 BOOL_SPECIAL_METHOD = "__bool__"
@@ -119,9 +118,9 @@ def __getattr__(self, name):
             return self.__dict__[name]
         return getattr(self._proxied, name)
 
-    def infer(
-        self: _ProxyT, context: InferenceContext | None = None, **kwargs: Any
-    ) -> collections.abc.Generator[_ProxyT, None, None]:
+    def infer(  # type: ignore[return]
+        self, context: InferenceContext | None = None, **kwargs: Any
+    ) -> collections.abc.Generator[InferenceResult, None, InferenceErrorInfo | None]:
         yield self
 
 

astroid/nodes/node_ng.py

@@ -34,7 +34,7 @@
 from astroid.nodes.as_string import AsStringVisitor
 from astroid.nodes.const import OP_PRECEDENCE
 from astroid.nodes.utils import Position
-from astroid.typing import InferenceResult, InferFn
+from astroid.typing import InferenceErrorInfo, InferenceResult, InferFn
 
 if TYPE_CHECKING:
     from astroid import nodes
@@ -593,7 +593,7 @@ def _infer_name(self, frame, name):
 
     def _infer(
         self, context: InferenceContext | None = None, **kwargs: Any
-    ) -> Generator[InferenceResult, None, None]:
+    ) -> Generator[InferenceResult, None, InferenceErrorInfo | None]:
         """we don't know how to resolve a statement by default"""
         # this method is overridden by most concrete classes
         raise InferenceError(

astroid/objects.py

@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 import sys
-from collections.abc import Iterator
+from collections.abc import Generator
 from typing import Any, TypeVar
 
 from astroid import bases, decorators, util
@@ -333,5 +333,5 @@ def infer_call_result(self, caller=None, context=None):
 
     def _infer(
         self: _T, context: InferenceContext | None = None, **kwargs: Any
-    ) -> Iterator[_T]:
+    ) -> Generator[_T, None, None]:
         yield self