gh-72889: remove redundant mock.Mock()._is_coroutine = False workarounds
#94926
Conversation
This file contains 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
graingert
reviewed
Jul 17, 2022
| self.loop._add_reader = mock.Mock() | ||
| self.loop._add_reader._is_coroutine = False |
There was a problem hiding this comment.
when asyncio.iscoroutinefunction was implemented as:
cpython/Lib/asyncio/coroutines.py
Lines 245 to 248 in 2f84144
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 issuehowever the implementation was changed to use a marker object:
cpython/Lib/asyncio/coroutines.py
Lines 16 to 23 in ec4745b
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
|
I don't think this needs a news entry |
gvanrossum
approved these changes
Jul 17, 2022
Since this just changes tests and the tests pass, I think this is okay.
|
Thanks @graingert for the PR, and @gvanrossum for merging it |
|
GH-94934 is a backport of this pull request to the 3.11 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this issue
Jul 17, 2022
…rkarounds (pythonGH-94926) (cherry picked from commit 07aeb74) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
these work-arounds were made redundant by python/asyncio#459