Skip to content

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

Merged
corona10 merged 3 commits into
python:mainfrom
erlend-aasland:sqlite-fix-add-ints
Oct 31, 2021
Merged

bpo-45634: Don't combine error checks when adding sqlite3 int constants#29251
corona10 merged 3 commits into
python:mainfrom
erlend-aasland:sqlite-fix-add-ints

Conversation

@erlend-aasland

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

Copy link
Copy Markdown
Contributor

@erlend-aasland

erlend-aasland commented Oct 27, 2021•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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.

gareth-rees
gareth-rees reviewed Oct 28, 2021
View reviewed changes
Comment threadModules/_sqlite/module.c Outdated
@erlend-aasland

erlend-aasland commented Oct 29, 2021

Copy link
Copy Markdown
ContributorAuthor

Note to self: update GH-28463 after merge.

@corona10
corona10 merged commit 39b4d59 into python:mainOct 31, 2021
@miss-islington

miss-islington commented Oct 31, 2021

Copy link
Copy Markdown
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

miss-islington commented Oct 31, 2021

Copy link
Copy Markdown
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

erlend-aasland commented Oct 31, 2021

Copy link
Copy Markdown
ContributorAuthor

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

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Oct 31, 2021
Erlend Egeberg Aasland
[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

bedevere-bot commented Oct 31, 2021

Copy link
Copy Markdown

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

Reviewers

@corona10corona10corona10 approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag
@ambvambvAwaiting requested review from ambv
+1 more reviewer
@gareth-reesgareth-reesgareth-rees left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@corona10corona10

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