Skip to content
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

gh-105332: [Enum] Fix unpickling flags in edge-cases #105348

Merged
merged 2 commits into from Jun 8, 2023
Merged

gh-105332: [Enum] Fix unpickling flags in edge-cases #105348

merged 2 commits into from Jun 8, 2023

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jun 6, 2023 •
edited

The only problem that this PR fixes is that TypeError: unsupported operand type(s) for |: 'PxdEnum' and 'NoneType' does not happen anymore.

It does not change any difference between 3.10 and 3.11

@bedevere-bot bedevere-bot mentioned this pull request Jun 6, 2023
Closed
@ethanfurman ethanfurman changed the title gh-105332: Fix unpickling enum.Flag with specific values gh-105332: [Enum] Fix unpickling flags in edge-cases Jun 8, 2023
@ethanfurman ethanfurman self-assigned this Jun 8, 2023
@ethanfurman ethanfurman added type-bug An unexpected behavior, bug, or error stdlib Python modules in the Lib dir 3.11 only security fixes 3.12 bugs and security fixes needs backport to 3.11 only security fixes 3.13 bugs and security fixes needs backport to 3.12 bug and security fixes labels Jun 8, 2023
@ethanfurman ethanfurman merged commit 4ff5690 into python:main Jun 8, 2023
30 checks passed
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

GH-105519 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 Jun 8, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 8, 2023
@sobolevn @ethanfurman @miss-islington
pythongh-105332: [Enum] Fix unpickling flags in edge-cases (pythonGH-…
83d528b 
…105348)

* revert enum pickling from by-name to by-value

(cherry picked from commit 4ff5690)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
@ethanfurman ethanfurman added 3.12 bugs and security fixes needs backport to 3.12 bug and security fixes and removed 3.12 bugs and security fixes needs backport to 3.12 bug and security fixes labels Jun 8, 2023
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 8, 2023
@sobolevn @ethanfurman @miss-islington
pythongh-105332: [Enum] Fix unpickling flags in edge-cases (pythonGH-…
62d5c41 
…105348)

* revert enum pickling from by-name to by-value

(cherry picked from commit 4ff5690)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
@bedevere-bot
Copy link

GH-105520 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 8, 2023
@sobolevn
Copy link
Member Author

sobolevn commented Jun 8, 2023

@ethanfurman thanks a lot for your help! 👍

ethanfurman added a commit that referenced this pull request Jun 9, 2023
@miss-islington @sobolevn @ethanfurman
[3.12] gh-105332: [Enum] Fix unpickling flags in edge-cases (GH-105348)…
2f4a2d6 
… (GH-105520)

* revert enum pickling from by-name to by-value

(cherry picked from commit 4ff5690)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
ethanfurman added a commit that referenced this pull request Jun 9, 2023
@miss-islington @sobolevn @ethanfurman
[3.11] gh-105332: [Enum] Fix unpickling flags in edge-cases (GH-105348)…
fed1b5a 
… (GH-105519)

* revert enum pickling from by-name to by-value

(cherry picked from commit 4ff5690)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
@sobolevn sobolevn mentioned this pull request Jun 16, 2023
Closed
@ThiefMaster ThiefMaster mentioned this pull request Jun 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ethanfurman ethanfurman ethanfurman approved these changes

Assignees

@ethanfurman ethanfurman

Labels
3.11 only security fixes 3.12 bugs and security fixes 3.13 bugs and security fixes stdlib Python modules in the Lib dir type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sobolevn @miss-islington @bedevere-bot @ethanfurman