-
-
Notifications
You must be signed in to change notification settings - Fork 33.8k
gh-142418: Fix inspect.iscoroutinefunction for marked functools.partial and partialmethod objects #142503
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
Joshua-Ward1
wants to merge
9
commits into
python:main
Choose a base branch
from
Joshua-Ward1:fix-142418-iscoroutinefunction-partial
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
gh-142418: Fix inspect.iscoroutinefunction for marked functools.partial and partialmethod objects #142503
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a51db30
Doc: clarify -i interaction with PYTHONSTARTUP
Joshua-Ward1 1c4e6b9
gh-142418: Fix inspect.iscoroutinefunction for marked functools.parti…
Joshua-Ward1 245a701
Fix NEWS entry formatting for gh-142418
Joshua-Ward1 6084378
Rename NEWS entry to follow format
Joshua-Ward1 6117107
Fixed Filename
Joshua-Ward1 dba7cb9
gh-142418: Remove unnecessary cycle detection from _has_coroutine_mark
Joshua-Ward1 9961179
gh-142418: Simplify _has_coroutine_mark by removing unnecessary cycle…
Joshua-Ward1 1f05728
gh-142418: Restore __partialmethod__ handling in _has_coroutine_mark
Joshua-Ward1 5d5c324
Reorder coroutine marker check after method unwrapping
Joshua-Ward1 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
Some comments aren't visible on the classic Files Changed page.
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
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 |
|---|---|---|
|
|
@@ -306,10 +306,33 @@ def isgeneratorfunction(obj): | |
| _is_coroutine_mark = object() | ||
|
|
||
| def _has_coroutine_mark(f): | ||
| while ismethod(f): | ||
| f = f.__func__ | ||
| f = functools._unwrap_partial(f) | ||
| return getattr(f, "_is_coroutine_marker", None) is _is_coroutine_mark | ||
| visited = set() | ||
| while True: | ||
|
Member
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. Please:
|
||
| if id(f) in visited: | ||
| return False | ||
| visited.add(id(f)) | ||
Joshua-Ward1 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| if getattr(f, "_is_coroutine_marker", None) is _is_coroutine_mark: | ||
| return True | ||
|
|
||
| pm = getattr(f, "__partialmethod__", None) | ||
| if isinstance(pm, functools.partialmethod): | ||
| f = pm | ||
| continue | ||
|
|
||
| if isinstance(f, functools.partialmethod): | ||
| f = getattr(f, 'func') | ||
| continue | ||
Joshua-Ward1 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| if ismethod(f): | ||
| f = f.__func__ | ||
| continue | ||
Joshua-Ward1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if isinstance(f, functools.partial): | ||
| f = f.func | ||
| continue | ||
|
|
||
| return False | ||
|
|
||
| def markcoroutinefunction(func): | ||
| """ | ||
|
|
||
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
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fix inspect.iscoroutinefunction() not detecting marked functools.partial or functools.partialmethod objects. |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems unrelated changes