[arpittkhandelwal]

Summary

ForwardRef.evaluate() had an early return for references holding a
single closure cell (__cell__ is a CellType) that ran before any
namespace handling. As a result, explicitly passed globals/locals
were silently ignored for such references, while every other path in
the same method (plain references, dict-of-cells references) gives
explicit namespaces precedence over the captured scope.

Fix

In Lib/annotationlib.py (ForwardRef.evaluate):

• The single-cell shortcut now only applies when neither globals
  nor locals was passed, preserving the existing fast path and
  behaviour for the common no-argument call.
• In the plain-identifier resolution branch, the cell value is
  consulted after locals and globals (and before builtins,
  matching normal scope order), so it acts as a fallback when an
  explicitly passed namespace does not provide the name. An empty
  cell (ValueError) falls through exactly as before.

No other paths are changed: the dict-of-cells and __extra_names__
handling, type-parameter injection, and the non-identifier eval
path are untouched.

Tests

Two regression tests in Lib/test/test_annotationlib.py
(TestForwardRefClass):

• test_evaluate_cell_with_explicit_namespaces — explicit locals
  and globals win over the cell (locals over globals when both are
  given, in both VALUE and FORWARDREF formats); the cell remains the
  fallback when the name is absent from the explicit namespaces.
• test_evaluate_empty_cell_with_explicit_namespaces — an emptied
  cell still raises NameError with no arguments, explicit namespaces
  are consulted, and a refilled cell resumes its fallback role without
  overriding explicit namespaces.

Both tests fail on the unmodified code and pass with this change.

Results (local build of main @ 83fe630):

• test_annotationlib: 123 tests run — SUCCESS (121 pre-existing +
  2 new).
• test_typing: SUCCESS.
• test_inspect: 1 failure in
  test_details_option_with_package, which also fails on the
  unmodified tree in this environment (it compares inspect CLI
  output containing stdlib file paths); unrelated to this change.

Fixes gh-160948.

Disclosure: this change was drafted with AI assistance and reviewed by the author, who takes responsibility for it.

[picnixz]

Considering the issue is still under discussion, I'm closing this.

[picnixz]

We may keep it open and only change the locals handling. Because the globals one may not be wrong.