← 返回首页
gh-72889: remove redundant `mock.Mock()._is_coroutine = False` workarounds by graingert · Pull Request #94926 · python/cpython · GitHub
Skip to content

Navigation Menu

Toggle navigation
Sign in
Appearance settings
Search or jump to...

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted
Cancel Submit feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel Create saved search
Appearance settings
Resetting focus

gh-72889: remove redundant mock.Mock()._is_coroutine = False workarounds#94926

Merged
gvanrossum merged 2 commits into
python:mainfrom
graingert:remove-redudant-mock-is-coroutine-workarounds
Jul 17, 2022
Merged

gh-72889: remove redundant mock.Mock()._is_coroutine = False workarounds#94926
gvanrossum merged 2 commits into
python:mainfrom
graingert:remove-redudant-mock-is-coroutine-workarounds

Conversation

graingert commented Jul 17, 2022 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

graingert requested review from 1st1 and asvetlov as code owners July 17, 2022 13:56
bedevere-bot added awaiting review tests Tests in the Lib/test dir labels Jul 17, 2022
graingert commented Jul 17, 2022
View reviewed changes
Comment thread Lib/test/test_asyncio/test_base_events.py
Comment on lines 1287 to -1289
self.loop._add_reader = mock.Mock()
self.loop._add_reader._is_coroutine = False

graingert Jul 17, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

when asyncio.iscoroutinefunction was implemented as:

cpython/Lib/asyncio/coroutines.py

Lines 245 to 248 in 2f84144

def iscoroutinefunction(func):
"""Return True if func is a decorated coroutine function."""
return (getattr(func, '_is_coroutine', False) or
_inspect_iscoroutinefunction(func))

this meant

self.loop._add_reader = mock.Mock() assert asyncio.iscoroutinefunction(self.loop._add_reader) is True # mock objects have a truthy _is_coroutine attribute! self.loop._add_reader._is_coroutine = False assert asyncio.iscoroutinefunction(self.loop._add_reader) is False # patching it works around the issue

however the implementation was changed to use a marker object:

cpython/Lib/asyncio/coroutines.py

Lines 16 to 23 in ec4745b

# A marker for iscoroutinefunction.
_is_coroutine = object()
def iscoroutinefunction(func):
"""Return True if func is a decorated coroutine function."""
return (inspect.iscoroutinefunction(func) or
getattr(func, '_is_coroutine', None) is _is_coroutine)

and so now the _is_coroutine = False work-around is redundant:

self.loop._add_reader = mock.Mock() assert asyncio.iscoroutinefunction(self.loop._add_reader) is False # mock objects have an _is_coroutine but it's not the asyncio.coroutines._is_coroutine sentinel self.loop._add_reader._is_coroutine = False assert asyncio.iscoroutinefunction(self.loop._add_reader) is False # it's still False so the workaround is redundant

graingert commented Jul 17, 2022

Copy link
Copy Markdown
Contributor Author

I don't think this needs a news entry

gvanrossum approved these changes Jul 17, 2022
View reviewed changes

gvanrossum left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

Since this just changes tests and the tests pass, I think this is okay.

gvanrossum merged commit 07aeb74 into python:main Jul 17, 2022

miss-islington commented Jul 17, 2022

Copy link
Copy Markdown
Contributor

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

bedevere-bot commented Jul 17, 2022

Copy link
Copy Markdown

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

bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 17, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 17, 2022
pythongh-72889: Remove redundant mock.Mock()._is_coroutine = False wo… …
ed2722b
…rkarounds (pythonGH-94926) (cherry picked from commit 07aeb74) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
graingert deleted the remove-redudant-mock-is-coroutine-workarounds branch July 17, 2022 17:23
miss-islington added a commit that referenced this pull request Jul 17, 2022
gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarou… …
8d0249e
…nds (GH-94926) (cherry picked from commit 07aeb74) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
mdboom mentioned this pull request Aug 12, 2022
Open
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

gvanrossum gvanrossum approved these changes
1st1 Awaiting requested review from 1st1 1st1 is a code owner
asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees

No one assigned

Labels

skip news tests Tests in the Lib/test dir topic-asyncio

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Footer

© 2026 GitHub, Inc.