Skip to content

Ensure that GenericCallable is generated if typevars are present. #91

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

Closed
dnwpark wants to merge 7 commits into from
Closed

Ensure that GenericCallable is generated if typevars are present. #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f59ebd
Expand existing tests.
dnwpark Feb 9, 2026
a91ae7c
Add tests.
dnwpark Feb 9, 2026
f192a99
Extract type vars that are from outside the function.
dnwpark Feb 9, 2026
ea37123
Pass receiver type to generic lambda.
dnwpark Feb 10, 2026
50c1ad1
Find extra type vars in function types.
dnwpark Feb 10, 2026
233fbc3
Fix existing tests.
dnwpark Feb 10, 2026
fcfe2c0
Use __name__ in format_helper.
dnwpark Feb 10, 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
2 changes: 1 addition & 1 deletion tests/format_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def format_meth(name, meth):

ts = ""
if params := root.__type_params__:
ts = "[" + ", ".join(str(p) for p in params) + "]"
ts = "[" + ", ".join(p.__name__ for p in params) + "]"

return f"{name}{ts}{sig}"

Expand Down
47 changes: 31 additions & 16 deletions tests/test_type_dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
Member,
Members,
NewProtocol,
Param,
Uppercase,
)

Expand Down Expand Up @@ -205,11 +206,11 @@ class Final:
x: tests.test_type_dir.Wrapper[int | None]
ordinary: str
def foo(self: Self, a: int | None, *, b: int = ...) -> dict[str, int]: ...
def base[Z](self: Self, a: int | Z | None, b: ~K) -> dict[str, int | Z]: ...
def base[Z, K](self: Self, a: int | Z | None, b: ~K) -> dict[str, int | Z]: ...
Copy link
Collaborator

@msullivan msullivan Feb 11, 2026

Choose a reason for hiding this comment

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

Maybe we should take that K out of Final. It doesn't really make sense.

Copy link
Contributor Author

@dnwpark dnwpark Feb 11, 2026

Choose a reason for hiding this comment

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

other than the wacky formatting (K vs ~K), what would you expect this to look like?

@classmethod
def cbase(cls: type[typing.Self], a: int | None, b: ~K) -> dict[str, int]: ...
def cbase[K](cls: type[typing.Self], a: int | None, b: ~K) -> dict[str, int]: ...
@staticmethod
def sbase[Z](a: OrGotcha[int] | Z | None, b: ~K) -> dict[str, int | Z]: ...
def sbase[Z, K](a: OrGotcha[int] | Z | None, b: ~K) -> dict[str, int | Z]: ...
""")


Expand Down Expand Up @@ -409,11 +410,19 @@ def test_type_members_func_2():
assert name == typing.Literal["cbase"]
assert quals == typing.Literal["ClassVar"]

assert (
str(typ)
== "\
classmethod[tests.test_type_dir.Base[int], tuple[typemap.typing.Param[typing.Literal['a'], int | None, typing.Never], typemap.typing.Param[typing.Literal['b'], ~K, typing.Never]], dict[str, int]]"
)
assert str(typ) == "typemap.typing.GenericCallable[tuple[~K], <...>]"

with _ensure_context():
assert (
typ.__args__[1](float)
== classmethod[
Base[int],
tuple[
Param[Literal["a"], int | None], Param[Literal["b"], float]
],
dict[str, int],
]
)


def test_type_members_func_3():
Expand All @@ -424,15 +433,21 @@ def test_type_members_func_3():
assert name == typing.Literal["sbase"]
assert quals == typing.Literal["ClassVar"]

assert str(typ) == "typemap.typing.GenericCallable[tuple[Z], <...>]"
assert str(typ) == "typemap.typing.GenericCallable[tuple[Z, ~K], <...>]"

evaled = eval_typing(
typing.get_args(typ)[1](*typing.get_args(typing.get_args(typ)[0]))
)
assert (
str(evaled)
== "staticmethod[tuple[typemap.typing.Param[typing.Literal['a'], int | typing.Literal['gotcha!'] | Z | None, typing.Never], typemap.typing.Param[typing.Literal['b'], ~K, typing.Never]], dict[str, int | Z]]"
)
with _ensure_context():
assert (
eval_typing(typ.__args__[1](float, bool))
== staticmethod[
tuple[
Param[
Literal["a"], int | Literal['gotcha!'] | float | None
],
Param[Literal["b"], bool],
],
dict[str, int | float],
]
)


# Test initializers
Expand Down
Loading