10000 [3.11] gh-112006: Fix inspect.unwrap() for types where __wrapped__ is a data descriptor (GH-115540) by miss-islington · Pull Request #115965 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.11] gh-112006: Fix inspect.unwrap() for types where __wrapped__ is a data descriptor (GH-115540) #115965

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
merged 2 commits into from
Feb 27, 2024
Merged

[3.11] gh-112006: Fix inspect.unwrap() for types where __wrapped__ is a data descriptor (GH-115540) #115965

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
6f4602f
gh-112006: Fix inspect.unwrap() for types where __wrapped__ is a data…
serhiy-storchaka Feb 26, 2024
abc7671
Fix tests.
serhiy-storchaka Feb 27, 2024
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
Next Next commit
gh-112006: Fix inspect.unwrap() for types where __wrapped__ is a data… 
… descriptor (GH-115540)

This also fixes inspect.Signature.from_callable() for builtins classmethod()
and staticmethod().
(cherry picked from commit 68c79d2)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
@serhiy-storchaka @miss-islington
serhiy-storchaka authored and miss-islington committed Feb 26, 2024
commit 6f4602f1cce4ff9f4578faa64dd381e38e9fc829
10 changes: 3 additions & 7 deletions Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,18 +748,14 @@ def unwrap(func, *, stop=None):
:exc:`ValueError` is raised if a cycle is encountered.

"""
if stop is None:
def _is_wrapper(f):
return hasattr(f, '__wrapped__')
else:
def _is_wrapper(f):
return hasattr(f, '__wrapped__') and not stop(f)
f = func # remember the original func for error reporting
# Memoise by id to tolerate non-hashable objects, but store objects to
# ensure they aren't destroyed, which would allow their IDs to be reused.
memo = {id(f): f}
recursion_limit = sys.getrecursionlimit()
while _is_wrapper(func):
while not isinstance(func, type) and hasattr(func, '__wrapped__'):
if stop is not None and stop(func):
break
func = func.__wrapped__
id_func = id(func)
if (id_func in memo) or (len(memo) >= recursion_limit):
Expand Down
32 changes: 26 additions & 6 deletions Lib/test/test_inspect/test_inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,6 +2732,10 @@ def m1d(*args, **kwargs):
int))

def test_signature_on_classmethod(self):
self.assertEqual(self.signature(classmethod),
((('function', ..., ..., "positional_only"),),
...))

class Test:
@classmethod
def foo(cls, arg1, *, arg2=1):
Expand All @@ -2750,6 +2754,10 @@ def foo(cls, arg1, *, arg2=1):
...))

def test_signature_on_staticmethod(self):
self.assertEqual(self.signature(staticmethod),
((('function', ..., ..., "positional_only"),),
...))

class Test:
@staticmethod
def foo(cls, *, arg):
Expand Down Expand Up @@ -3273,16 +3281,20 @@ class Bar(Spam, Foo):
((('a', ..., ..., "positional_or_keyword"),),
...))

class Wrapped:
pass
Wrapped.__wrapped__ = lambda a: None
self.assertEqual(self.signature(Wrapped),
def test_signature_on_wrapper(self):
class Wrapper:
def __call__(self, b):
pass
wrapper = Wrapper()
wrapper.__wrapped__ = lambda a: None
self.assertEqual(self.signature(wrapper),
((('a', ..., ..., "positional_or_keyword"),),
...))
# wrapper loop:
Wrapped.__wrapped__ = Wrapped
wrapper = Wrapper()
wrapper.__wrapped__ = wrapper
with self.assertRaisesRegex(ValueError, 'wrapper loop'):
self.signature(Wrapped)
self.signature(wrapper)

def test_signature_on_lambdas(self):
self.assertEqual(self.signature((lambda a=10: a)),
Expand Down Expand Up @@ -4433,6 +4445,14 @@ def test_recursion_limit(self):
with self.assertRaisesRegex(ValueError, 'wrapper loop'):
inspect.unwrap(obj)

def test_wrapped_descriptor(self):
self.assertIs(inspect.unwrap(NTimesUnwrappable), NTimesUnwrappable)
self.assertIs(inspect.unwrap(staticmethod), staticmethod)
self.assertIs(inspect.unwrap(classmethod), classmethod)
self.assertIs(inspect.unwrap(stati 8E1C cmethod(classmethod)), classmethod)
self.assertIs(inspect.unwrap(classmethod(staticmethod)), staticmethod)


class TestMain(unittest.TestCase):
def test_only_source(self):
module = importlib.import_module('unittest')
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2024-02-15-23-42-54.gh-issue-112006.4wxcK-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix :func:`inspect.unwrap` for types with the ``__wrapper__`` data
descriptor. Fix :meth:`inspect.Signature.from_callable` for builtins
:func:`classmethod` and :func:`staticmethod`.
0