8000 gh-103193: Improve `getattr_static` test coverage by AlexWaygood · Pull Request #104286 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103193: Improve getattr_static test coverage #104286

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

Jump to bottom
Merged
AlexWaygood merged 1 commit into from
May 8, 2023
Merged

gh-103193: Improve getattr_static test coverage #104286

AlexWaygood merged 1 commit into from
May 8, 2023

Conversation

@AlexWaygood
Copy link
Member
@AlexWaygood AlexWaygood commented May 8, 2023 •
edited
Loading

Currently, no tests would fail if we were to apply this optimisation to getattr_static, which makes things a fair bit faster:

--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1780,13 +1780,9 @@ def trace(context=1):


 def _check_instance(obj, attr):
-    instance_dict = {}
-    try:
-        instance_dict = object.__getattribute__(obj, "__dict__")
-    except AttributeError:
-        pass
-    return dict.get(instance_dict, attr, _sentinel)
-
+    if hasattr(obj, "__dict__"):
+        return dict.get(obj.__dict__, attr, _sentinel)
+    return _sentinel

However, the optimisation would lead to incorrect behaviour. test_custom___getattribute__, added in this PR, would correctly fail if the incorrect optimisation were applied.

@AlexWaygood AlexWaygood added tests Tests in the Lib/test dir skip news needs backport to 3.11 only security fixes labels May 8, 2023
@AlexWaygood AlexWaygood requested a review from carljm May 8, 2023 08:52
@bedevere-bot bedevere-bot mentioned this pull request May 8, 2023
Closed
@AlexWaygood AlexWaygood merged commit 921185e into python:main May 8, 2023
@miss-islington
Copy link
Contributor
miss-islington commented May 8, 2023

Thanks @AlexWaygood for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor
miss-islington commented May 8, 2023

Sorry @AlexWaygood, I had trouble checking out the 3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 921185ed050efbca2f0adeab79f676b7f8cc3660 3.11

@AlexWaygood AlexWaygood deleted the attr_static-coverage branch May 8, 2023 14:18
@AlexWaygood AlexWaygood added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels May 8, 2023
@miss-islington
Copy link
Contributor
miss-islington commented May 8, 2023

Thanks @AlexWaygood for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link
bedevere-bot commented May 8, 2023

GH-104290 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label May 8, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 8, 2023
@AlexWaygood @miss-islington
pythongh-103193: Improve getattr_static test coverage (pythonGH-104286
06532ae 
)

(cherry picked from commit 921185e)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
AlexWaygood added a commit that referenced this pull request May 8, 2023
@miss-islington @AlexWaygood
[3.11] gh-103193: Improve getattr_static test coverage (GH-104286) (#…
d54f644 
…104290)

gh-103193: Improve `getattr_static` test coverage (GH-104286)
(cherry picked from commit 921185e)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>