8000 gh-94912: Added marker for non-standard coroutine function detection by carltongibson · Pull Request #99247 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-94912: Added marker for non-standard coroutine function detection #99247

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 16 commits into from
Dec 18, 2022
Merged

gh-94912: Added marker for non-standard coroutine function detection #99247

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4cf8e98
Added initial test and docs drafts.
carltongibson Nov 8, 2022
6b8fa87
Make first case pass setting code flags.
carltongibson Nov 15, 2022
fa22a16
Adjust iscoroutinefunction() to look for async __call__.
carltongibson Nov 15, 2022
513d358
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 17, 2022
397a975
Moved to decorator; extra tests.
carltongibson Nov 17, 2022
d156eab
Added tests for lambda, @classmethod, and @staticmethod cases.
carltongibson Nov 23, 2022
34859de
Adjusted docs signature for review comment.
carltongibson Nov 23, 2022
47a9fea
Improve grammar in NEWS file
gvanrossum Nov 23, 2022
cd6c491
Adjusted docs.
carltongibson Nov 29, 2022
629dd81
Updated for review comments.
carltongibson Nov 30, 2022
a518c0f
Merge branch 'main' into fix-issue-XXXXX
gvanrossum Nov 30, 2022
c6d2b88
Use marker for implementation.
carltongibson Dec 6, 2022
b7249a8
Added "What's New..." entry.
carltongibson Dec 6, 2022
3bc72e2
Adjusted implementation.
carltongibson Dec 8, 2022
c073cf7
Renamed to _is_coroutine_marker.
carltongibson Dec 13, 2022
5ffba32
Adjusted implementation and docs.
carltongibson Dec 13, 2022
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
Prev Previous commit
Next Next commit
Renamed to _is_coroutine_marker.
  • Loading branch information
@carltongibson
carltongibson committed Dec 13, 2022
commit c073cf79867a702dc4de6a0659dd9d16bfe4b44e
12 changes: 6 additions & 6 deletions Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,15 +393,15 @@ def isgeneratorfunction(obj):
return _has_code_flag(obj, CO_GENERATOR)

# A marker for markcoroutinefunction and iscoroutinefunction.
_is_coroutine = object()
_is_coroutine_marker = object()

def markcoroutinefunction(func):
"""
Decorator to ensure callable is recognised as a coroutine function.
"""
if hasattr(func, '__func__'):
func = func.__func__
func._is_coroutine = _is_coroutine
func._is_coroutine_marker = _is_coroutine_marker
return func

def iscoroutinefunction(obj):
Expand All @@ -412,10 +412,10 @@ def iscoroutinefunction(obj):
"""
if not isclass(obj) and callable(obj):
# Test both the function and the __call__ implementation for the
# _is_coroutine marker.
f = getattr(getattr(obj, "__func__", obj), "_is_coroutine", None)
c = getattr(obj.__call__, "_is_coroutine", None)
if f is _is_coroutine or c is _is_coroutine:
# _is_coroutine_marker.
f = getattr(getattr(obj, "__func__", obj), "_is_coroutine_marker", None)
c = getattr(obj.__call__, "_is_coroutine_marker", None)
if f is _is_coroutine_marker or c is _is_coroutine_marker:
return True

return _has_code_flag(obj, CO_COROUTINE) or (
Expand Down
0