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

bpo-45634: Don't combine error checks when adding sqlite3 int constants #29251

Merged
merged 3 commits into from
Oct 31, 2021
Merged

bpo-45634: Don't combine error checks when adding sqlite3 int constants #29251

merged 3 commits into from
Oct 31, 2021

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Oct 27, 2021 •
edited by bedevere-bot
Loading

@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Oct 27, 2021 •
edited
Loading

FYI, 3.9 does this right. Actually, it's worse :) But backporting to 3.9 would not be straight-forward. The module init code has changed substantially between 3.9 and 3.10, so I'd prefer to leave 3.9 as it is.

@erlend-aasland erlend-aasland requested a review from ambv October 28, 2021 21:15
@erlend-aasland
Copy link
Contributor Author

Note to self: update GH-28463 after merge.

@corona10 corona10 merged commit 39b4d59 into python:main Oct 31, 2021
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry @erlend-aasland and @corona10, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 39b4d5938ce781af41f8c9da72dee46095a78642 3.10

@erlend-aasland erlend-aasland deleted the sqlite-fix-add-ints branch October 31, 2021 10:15
@erlend-aasland
Copy link
Contributor Author

Thanks, @corona10. I'll fix the backport.

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Oct 31, 2021
[3.10] bpo-45634: Don't combine error checks when adding sqlite3 in…
0d24c76 
…t constants (pythonGH-29251).

(cherry picked from commit 39b4d59)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot
Copy link

GH-29343 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 Oct 31, 2021
corona10 pushed a commit that referenced this pull request Oct 31, 2021
[3.10] bpo-45634: Don't combine error checks when adding sqlite3 in…
ed91f95 
…t constants (GH-29251). (GH-29343)
@erlend-aasland erlend-aasland mentioned this pull request May 16, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gareth-rees gareth-rees gareth-rees left review comments

@corona10 corona10 corona10 approved these changes

@berkerpeksag berkerpeksag Awaiting requested review from berkerpeksag berkerpeksag is a code owner

@ambv ambv Awaiting requested review from ambv

Assignees

@corona10 corona10

Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@erlend-aasland @miss-islington @bedevere-bot @gareth-rees @corona10 @the-knights-who-say-ni