Skip to content
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.

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

stubgen.py: handle method aliases similarly to function aliases #735

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion src/stubgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,20 @@ def put_nb_func(self, fn: NbFunction, name: Optional[str] = None) -> None:
self.write_ln(f"@{overload}")
self.put_nb_overload(fn, s, name)

def put_nb_method(self, fn: NbFunction, name: Optional[str], parent: Optional[object]) -> None:
fn_qualname = getattr(fn, "__qualname__", None)
if name and fn_qualname:
fn_class, _, fn_name = fn_qualname.rpartition('.')
# Check if this function is an alias
if name != fn_name:
if fn_class == getattr(parent, "__qualname__", None):
real_name = fn_name
else:
real_name = fn_qualname
self.write_ln(f"{name} = {real_name}\n")
return
self.put_nb_func(fn, name)

def put_function(self, fn: Callable[..., Any], name: Optional[str] = None, parent: Optional[object] = None):
"""Append a function of an arbitrary type to the stub"""
# Don't generate a constructor for nanobind classes that aren't constructible
Expand Down Expand Up @@ -848,7 +862,7 @@ def put(self, value: object, name: Optional[str] = None, parent: Optional[object
elif tp_mod == "nanobind":
if tp_name == "nb_method":
value = cast(NbFunction, value)
self.put_nb_func(value, name)
self.put_nb_method(value, name, parent)
elif tp_name == "nb_static_property":
value = cast(NbStaticProperty, value)
self.put_nb_static_property(name, value)
Expand Down
3 changes: 2 additions & 1 deletion tests/test_typing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ NB_MODULE(test_typing_ext, m) {

m.def("makeNestedClass", [] { return NestedClass(); });

// Aliases to local functoins and types
// Aliases to functions and types
m.attr("FooAlias") = m.attr("Foo");
m.attr("f_alias") = m.attr("f");
nb::type<Foo>().attr("lt_alias") = nb::type<Foo>().attr("__lt__");

// Custom signature generation for classes and methods
struct CustomSignature { int value; };
Expand Down
2 changes: 2 additions & 0 deletions tests/test_typing_ext.pyi.ref
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class Foo:

def __ge__(self, arg: Foo, /) -> bool: ...

lt_alias = __lt__

FooAlias: TypeAlias = Foo

T = TypeVar("T", contravariant=True)
Expand Down