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

fix(python): user defined __jsii_proxy_class attributes are not preserved #4625

Merged
merged 2 commits into from
Aug 29, 2024
Merged
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
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/src/jsii/_runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def implements(*interfaces: Type[Any]) -> Callable[[T], T]:
def deco(cls):
cls.__jsii_type__ = getattr(cls, "__jsii_type__", None)
cls.__jsii_ifaces__ = getattr(cls, "__jsii_ifaces__", []) + list(interfaces)
cls.__jsii_proxy_class__ = lambda: getattr(cls, "__jsii_proxy_class__", None)
cls.__jsii_proxy_class__ = getattr(cls, "__jsii_proxy_class__", lambda: None)

# https://github.com/agronholm/typeguard/issues/479
cls.__protocol_attrs__ = getattr(cls, "__protocol_attrs__", [])
Expand Down
31 changes: 31 additions & 0 deletions packages/@jsii/python-runtime/tests/test_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,37 @@ def test_inheritance_maintained(self):

assert base_names == ["DerivedStruct", "MyFirstStruct"]


class TestImplementsInterface:

def test_jsii_proxy_class_defaults_to_none(self) -> None:
@jsii.implements(IBaz)
class MyBaz:
pass

klass = getattr(MyBaz, "__jsii_proxy_class__")()
assert klass == None

def test_jsii_proxy_class_preserves_user_defined_attribute(self) -> None:

class _MyBazProxy:
def baz_method(self) -> str:
return "_MyBazProxy"

@jsii.implements(IBaz)
class MyBaz:

@staticmethod
def __jsii_proxy_class__():
return _MyBazProxy

def baz_method(self) -> str:
return "MyBaz"

klass = getattr(MyBaz, "__jsii_proxy_class__")()
instance = klass()
assert instance.baz_method() == "_MyBazProxy"

def test_implements_interface(self) -> None:
"""Checks that jsii-generated classes correctly implement the relevant jsii-generated interfaces."""

Expand Down
Loading