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.

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

gh-103193: cache calls to inspect._shadowed_dict in inspect.getattr_static #104267

Merged
merged 4 commits into from
May 7, 2023
+32 −5
Merged

gh-103193: cache calls to inspect._shadowed_dict in inspect.getattr_static #104267

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb580ba
gh-103193: cache calls to inspect._shadowed_dict
AlexWaygood May 7, 2023
c26587c
Use mro tuple as the cache key
AlexWaygood May 7, 2023
b3cc123
Add regression test for if a class has its mro mutated(!)
AlexWaygood May 7, 2023
2f4b42f
Update perf numbers in whatsnew
AlexWaygood May 7, 2023
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
8 changes: 6 additions & 2 deletions Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,8 +1794,9 @@ def _check_class(klass, attr):
return entry.__dict__[attr]
return _sentinel

def _shadowed_dict(klass):
for entry in _static_getmro(klass):
@functools.lru_cache()
def _shadowed_dict_from_mro_tuple(mro):
for entry in mro:
dunder_dict = _get_dunder_dict_of_class(entry)
if '__dict__' in dunder_dict:
class_dict = dunder_dict['__dict__']
Expand All @@ -1805,6 +1806,9 @@ def _shadowed_dict(klass):
return class_dict
return _sentinel

def _shadowed_dict(klass):
return _shadowed_dict_from_mro_tuple(_static_getmro(klass))
Comment on lines +1809 to +1810
Copy link
Member Author

@AlexWaygood AlexWaygood May 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I considered inlining the calls to _static_getmro, but I thought this made it more readable. It also preserves git blame better, and having to pass through this function doesn't seem to have much impact on performance


def getattr_static(obj, attr, default=_sentinel):
"""Retrieve attributes without triggering dynamic lookup via the
descriptor protocol, __getattr__ or __getattribute__.
Expand Down