Skip to content
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 src/wrapt/proxies.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __wrapper_await__(self):
return (yield from self.__wrapped__.__await__())


def __wrapper_get__(self, instance, owner):
def __wrapper_get__(self, instance, owner=None):
return self.__wrapped__.__get__(instance, owner)


Expand Down
18 changes: 18 additions & 0 deletions tests/core/test_auto_object_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,24 @@ def test_fspath_not_pathlike(self):
self.assertRaises(TypeError, os.fspath, proxy)
self.assertFalse(isinstance(proxy, os.PathLike))

def test_descriptor_optional_owner(self):
def method(instance):
return instance

instance = object()

for descriptor in (method, property(method)):
with self.subTest(descriptor=descriptor):
proxy = wrapt.AutoObjectProxy(descriptor)

self.assertEqual(proxy.__get__(instance), descriptor.__get__(instance))
self.assertEqual(
proxy.__get__(instance, None), descriptor.__get__(instance, None)
)
self.assertEqual(
proxy.__get__(None, object), descriptor.__get__(None, object)
)

def test_descriptor(self):
class Descriptor:
def __init__(self, value):
Expand Down
20 changes: 20 additions & 0 deletions tests/core/test_lazy_object_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,26 @@ def factory():
self.assertEqual(int(proxy), 42)
self.assertEqual(status["created"], 1)

def test_descriptor_optional_owner(self):
def method(instance):
return instance

instance = object()

for descriptor in (method, property(method)):
with self.subTest(descriptor=descriptor):
proxy = wrapt.LazyObjectProxy(
lambda: descriptor, interface=type(descriptor)
)

self.assertEqual(proxy.__get__(instance), descriptor.__get__(instance))
self.assertEqual(
proxy.__get__(instance, None), descriptor.__get__(instance, None)
)
self.assertEqual(
proxy.__get__(None, object), descriptor.__get__(None, object)
)

def test_lazy_import(self):
if "sched" in sys.modules:
del sys.modules["sched"]
Expand Down
Loading