-
Notifications
You must be signed in to change notification settings - Fork 128
Avoid triggering @property methods on plugins when looking for hookimpls during registration #536
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
Open
pirate
wants to merge
9
commits into
pytest-dev:main
Choose a base branch
from
pirate:patch-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
24895d0
Avoid triggering property methods when inspecting plugin attribute si…
pirate aae3799
Add exception handler to deal with proxy object attrs as well
pirate 90d9f80
remove pydantic-specific logic and support hookspecs too
pirate 61a9a86
Merge branch 'main' into patch-1
pirate 2536c62
explicitly test that properties are ignored on both classes and insta…
pirate c0789a6
swap _attr_is_property arg Any type to object type
pirate bfe9f91
Return None instead of falling back to getattr(type(plugin))
pirate 16a2344
Merge branch 'main' into patch-1
pirate 4cab5d1
Merge branch 'main' into patch-1
pirate File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -181,7 +181,26 @@ | |
customize how hook implementation are picked up. By default, returns the | ||
options for items decorated with :class:`HookimplMarker`. | ||
""" | ||
method: object = getattr(plugin, name) | ||
|
||
# IMPORTANT: @property methods can have side effects, and are never hookimpl | ||
# if attr is a property, skip it in advance | ||
plugin_class = plugin if inspect.isclass(plugin) else type(plugin) | ||
if isinstance(getattr(plugin_class, name, None), property): | ||
return None | ||
|
||
# pydantic model fields are like attrs and also can never be hookimpls | ||
pirate marked this conversation as resolved.
Show resolved
Hide resolved
|
||
plugin_is_pydantic_obj = hasattr(plugin, "__pydantic_core_schema__") | ||
if plugin_is_pydantic_obj and name in getattr(plugin, "model_fields", {}): | ||
return None | ||
|
||
method: object | ||
try: | ||
method = getattr(plugin, name) | ||
except AttributeError: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you're able to cook a test for this case that would be nice. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. see comment here: #536 (comment) |
||
# AttributeError: '__signature__' attribute of 'Plugin' is class-only | ||
# can happen for some special objects (e.g. proxies, pydantic, etc.) | ||
method = getattr(type(plugin), name) # use class sig instead | ||
|
||
if not inspect.isroutine(method): | ||
return None | ||
try: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.