[10187] Fix IRC ctcpExtract for pypy 3.7.4. #1592
Merged
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
adiroiban
commented
Apr 28, 2021
| @@ -3678,10 +3678,10 @@ def ctcpExtract(message): | |||
| normal_messages.append(messages.pop(0)) | |||
| odd = not odd | |||
|
|
|||
| extended_messages[:] = filter(None, extended_messages) | |||
| normal_messages[:] = filter(None, normal_messages) | |||
| extended_messages[:] = list(filter(None, extended_messages)) | |||
There was a problem hiding this comment.
My suggestion is to have something like this
Suggested change
| extended_messages[:] = list(filter(None, extended_messages)) | |
| extended_messages = list(filter(None, extended_messages)) |
I don't know why we need to update the list "in-place"
There was a problem hiding this comment.
@adiroiban because the two lists are inserted into the retval dictionary earlier. (I'm not sure if it's written that way for a reason... The whole function could probably be tidied up a lot using some list comprehensions, if someone wanted to do that.)
There was a problem hiding this comment.
Ah... I see.
so the issue is here
extended_messages = []
normal_messages = []
retval = {"extended": extended_messages, "normal": normal_messages}
and the return dict could have been created at the end with
return {"extended": extended_messages, "normal": normal_messages}
I think that we can live with that.
wiml
approved these changes
Apr 29, 2021
|
I will land this since it's blocking builds. |
|
For reference upstream bug report https://foss.heptapod.net/pypy/pypy/-/issues/3451 |
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.
Suggestion cannot be applied right now. Please check back later.
Scope and purpose
Our CI is failing in trunk after the auto-upgrade to pypy 3.7.4 which uses py3.10.
The IRC tests are failing.
I have found that the source is twisted.words.protocols.irc.ctcpExtract
Contributor Checklist:
tox -e lintto format my patch to meet the Twisted Coding Standard#character).reviewto the keywords field in Trac, and putting a link to this PR in the comment; it shows up in https://twisted.reviews/ now.The first line is automatically generated by GitHub based on PR ID and branch name.
The other lines generated by GitHub should be replaced.