Skip to content

Fix type eval if params are not in alphabetical order. #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnwpark merged 2 commits into from
Jan 9, 2026
Merged

Fix type eval if params are not in alphabetical order. #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9cab3
Fix type eval if params are not in alphabetical order.
dnwpark Jan 9, 2026
60d87ad
update comment
dnwpark Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion tests/test_type_eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,17 @@ class TB:
y: list[object]


type GetA1[A, B] = A
type GetA2[B, A] = A


def test_eval_arg_order():
d = eval_typing(GetA1[int, str])
assert d is int
d = eval_typing(GetA2[str, int])
assert d is int


def test_type_getattr_union_1():
d = eval_typing(GetAttr[TA | TB, Literal["x"]])
assert d == int | str
Expand Down Expand Up @@ -640,7 +651,7 @@ def test_never_is():
assert d is True


def test_eval_iter():
def test_eval_iter_01():
d = eval_typing(Iter[tuple[int, str]])
assert tuple(d) == (int, str)

Expand Down
15 changes: 14 additions & 1 deletion typemap/type_eval/_eval_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,20 @@ def _eval_applied_type_alias(obj: types.GenericAlias, ctx: EvalContext):

func = obj.evaluate_value

args = tuple(types.CellType(_eval_types(arg, ctx)) for arg in obj.__args__)
# obj.__args__ matches the declared parameter order, but args are expected
# to be in alphabetical order.
Copy link
Copy Markdown
Collaborator

@msullivan msullivan Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, expected by what to be in alphabetical order? By co_freevars? Make that clear in the comment.

Though actually it's I guess not technically expected in alphabetical order. It's expected in the order co_freevars lists. Which probably happens to be alphabetical.
(I was confused for a minute because you were talking about alphabetical order but there wasn't any sort call)

args_by_name = dict(
zip(
(p.__name__ for p in obj.__origin__.__type_params__),
obj.__args__,
strict=False,
)
)

args = tuple(
types.CellType(_eval_types(args_by_name[name], ctx))
for name in func.__code__.co_freevars
)
mod = sys.modules[obj.__module__]

with _child_context() as child_ctx:
Expand Down