Jul 7, 2025 · Jul 6, 2025
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
            list[EqualToForwardRef('A')],
        )

    def test_with_module(self):
        from test.typinganndata import fwdref_module

        typing.evaluate_forward_ref(
            fwdref_module.fw,)


 class CollectionsAbcTests(BaseTestCase):

diff --git a/Lib/test/typinganndata/fwdref_module.py b/Lib/test/typinganndata/fwdref_module.py
 from typing import ForwardRef

 MyList = list[int]
 MyDict = dict[str, 'MyList']

 fw = ForwardRef('MyDict', module=__name__)
diff --git a/Lib/typing.py b/Lib/typing.py


 def _eval_type(t, globalns, localns, type_params=_sentinel, *, recursive_guard=frozenset(),
               format=None, owner=None):
               format=None, owner=None, parent_fwdref=None):
    """Evaluate all forward references in the given type t.

    For use of globalns and localns see the docstring for get_type_hints().
    if isinstance(t, (_GenericAlias, GenericAlias, Union)):
        if isinstance(t, GenericAlias):
            args = tuple(
                _make_forward_ref(arg) if isinstance(arg, str) else arg
                _make_forward_ref(arg, parent_fwdref=parent_fwdref) if isinstance(arg, str) else arg
                for arg in t.__args__
            )
            is_unpacked = t.__unpacked__
    return _GenericAlias(self, (item,))


 def _make_forward_ref(code, **kwargs):
 def _make_forward_ref(code, *, parent_fwdref=None, **kwargs):
    if parent_fwdref is not None:
        if parent_fwdref.__forward_module__ is not None:
            kwargs['module'] = parent_fwdref.__forward_module__
        if parent_fwdref.__owner__ is not None:
            kwargs['owner'] = parent_fwdref.__owner__
    forward_ref = _lazy_annotationlib.ForwardRef(code, **kwargs)
    # For compatibility, eagerly compile the forwardref's code.
    forward_ref.__forward_code__
        recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
        format=format,
        owner=owner,
        parent_fwdref=forward_ref,
    )


diff --git a/Misc/NEWS.d/next/Library/2025-07-05-06-56-16.gh-issue-136316.3zj_Do.rst b/Misc/NEWS.d/next/Library/2025-07-05-06-56-16.gh-issue-136316.3zj_Do.rst
 Improve support for evaluating nested forward references in
 :func:`typing.evaluate_forward_ref`.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7328,6 +7328,12 @@ def test_partial_evaluation(self):
		list[EqualToForwardRef('A')],
		)

		def test_with_module(self):
		from test.typinganndata import fwdref_module

		typing.evaluate_forward_ref(
		fwdref_module.fw,)


		class CollectionsAbcTests(BaseTestCase):

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,6 @@
		from typing import ForwardRef

		MyList = list[int]
		MyDict = dict[str, 'MyList']

		fw = ForwardRef('MyDict', module=__name__)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -430,7 +430,7 @@ def __repr__(self):


		def _eval_type(t, globalns, localns, type_params=_sentinel, *, recursive_guard=frozenset(),
		format=None, owner=None):
		format=None, owner=None, parent_fwdref=None):
		"""Evaluate all forward references in the given type t.

		For use of globalns and localns see the docstring for get_type_hints().
Expand All		@@ -451,7 +451,7 @@ def _eval_type(t, globalns, localns, type_params=_sentinel, *, recursive_guard=f
		if isinstance(t, (_GenericAlias, GenericAlias, Union)):
		if isinstance(t, GenericAlias):
		args = tuple(
		_make_forward_ref(arg) if isinstance(arg, str) else arg
		_make_forward_ref(arg, parent_fwdref=parent_fwdref) if isinstance(arg, str) else arg
		for arg in t.__args__
		)
		is_unpacked = t.__unpacked__
Expand DownExpand Up		@@ -936,7 +936,12 @@ def run(arg: Child \| Unrelated):
		return _GenericAlias(self, (item,))


		def _make_forward_ref(code, **kwargs):
		def _make_forward_ref(code, , parent_fwdref=None, *kwargs):
		if parent_fwdref is not None:
		if parent_fwdref.__forward_module__ is not None:
		kwargs['module'] = parent_fwdref.__forward_module__
		if parent_fwdref.__owner__ is not None:
		kwargs['owner'] = parent_fwdref.__owner__
		forward_ref = _lazy_annotationlib.ForwardRef(code, **kwargs)
		# For compatibility, eagerly compile the forwardref's code.
		forward_ref.__forward_code__
Expand DownExpand Up		@@ -1001,6 +1006,7 @@ def evaluate_forward_ref(
		recursive_guard=_recursive_guard \| {forward_ref.__forward_arg__},
		format=format,
		owner=owner,
		parent_fwdref=forward_ref,
		)


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Improve support for evaluating nested forward references in
		:func:`typing.evaluate_forward_ref`.