Skip to content

Conversation

@sobolevn
Copy link
Member

@sobolevnsobolevn commented Jan 11, 2023

sys.modules['json'] =self.json
try:
forprotocolinrange(6):
forprotocolinrange(pickle.HIGHEST_PROTOCOL+1):
Copy link
MemberAuthor

Choose a reason for hiding this comment

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

This change is not related, but I think it is minor enough to be included. It just replaces a magic number 6 with more context.

Copy link
Member

@AlexWaygoodAlexWaygood left a comment

Choose a reason for hiding this comment

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

Thanks!

@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8795ad1bd0d6ee031543fcaf5a86a60b37950714 3.10

@miss-islington
Copy link
Contributor

Sorry @sobolevn and @AlexWaygood, I had trouble checking out the 3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 8795ad1bd0d6ee031543fcaf5a86a60b37950714 3.11

@AlexWaygoodAlexWaygood added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels Jan 11, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8795ad1bd0d6ee031543fcaf5a86a60b37950714 3.11

@AlexWaygood
Copy link
Member

AlexWaygood commented Jan 11, 2023

@sobolevn, are you okay to do the backports? :)

@sobolevn
Copy link
MemberAuthor

Yes, will do a bit later.

sobolevn added a commit to sobolevn/cpython that referenced this pull request Jan 12, 2023
…ythonGH-100932). (cherry picked from commit 8795ad1) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-bot
Copy link

GH-100978 is a backport of this pull request to the 3.10 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Jan 12, 2023
sobolevn added a commit to sobolevn/cpython that referenced this pull request Jan 12, 2023
…ythonGH-100932). (cherry picked from commit 8795ad1) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-bot
Copy link

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

@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Jan 12, 2023
miss-islington pushed a commit that referenced this pull request Jan 12, 2023
). (GH-100978) (cherry picked from commit 8795ad1) Co-authored-by: Nikita Sobolev <mail@sobolevn.me> Automerge-Triggered-By: GH:AlexWaygood
miss-islington pushed a commit that referenced this pull request Jan 12, 2023
). (GH-100979) (cherry picked from commit 8795ad1) Co-authored-by: Nikita Sobolev <mail@sobolevn.me> Automerge-Triggered-By: GH:AlexWaygood
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip newstestsTests in the Lib/test dir

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@sobolevn@miss-islington@AlexWaygood@bedevere-bot