Skip to content

gh-100931: Test all pickle protocols in test_slice #100932

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

Jump to bottom
Merged
merged 1 commit into from
Jan 11, 2023
Merged

gh-100931: Test all pickle protocols in test_slice #100932

merged 1 commit into from
Jan 11, 2023

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jan 11, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Jan 11, 2023
Closed
@bedevere-bot bedevere-bot added the tests Tests in the Lib/test dir label Jan 11, 2023
sobolevn
sobolevn commented Jan 11, 2023
View reviewed changes
Lib/test/test_json/test_attrdict.py
@@ -133,7 +133,7 @@ def test_pickle(self):
cached_module = sys.modules.get('json')
sys.modules['json'] = self.json
try:
for protocol in range(6):
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
Copy link
Member Author

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.

AlexWaygood
AlexWaygood approved these changes Jan 11, 2023
View reviewed changes
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

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

Thanks!

@AlexWaygood AlexWaygood merged commit 8795ad1 into python:main Jan 11, 2023
@AlexWaygood AlexWaygood added needs backport to 3.10 only security fixes 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.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

@AlexWaygood AlexWaygood 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 •
edited
Loading

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

@sobolevn
Copy link
Member Author

Yes, will do a bit later.

sobolevn added a commit to sobolevn/cpython that referenced this pull request Jan 12, 2023
@sobolevn
[3.10] pythongh-100931: Test all pickle protocols in test_slice (p…
eedd3f0 
…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-bot bedevere-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
@sobolevn
[3.11] pythongh-100931: Test all pickle protocols in test_slice (p…
e52d37b 
…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-bot bedevere-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
@sobolevn
[3.10] gh-100931: Test all pickle protocols in test_slice (GH-100932
47b1eb9 
). (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
@sobolevn
[3.11] gh-100931: Test all pickle protocols in test_slice (GH-100932
cb6ff54 
). (GH-100979)

(cherry picked from commit 8795ad1)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

Automerge-Triggered-By: GH:AlexWaygood
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexWaygood AlexWaygood AlexWaygood approved these changes

Assignees

@AlexWaygood AlexWaygood

Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sobolevn @miss-islington @AlexWaygood @bedevere-bot