Skip to content

gh-95273: Improve sqlite3.complete_statement docs - #95840

Merged
erlend-aasland merged 6 commits into
python:mainfrom
erlend-aasland:sqlite-reference/complete-statement
Aug 11, 2022
Merged

gh-95273: Improve sqlite3.complete_statement docs#95840
erlend-aasland merged 6 commits into
python:mainfrom
erlend-aasland:sqlite-reference/complete-statement

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Aug 9, 2022•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@erlend-aaslanderlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.10 only security fixes labels Aug 9, 2022
CAM-Gerlach
CAM-Gerlach reviewed Aug 10, 2022
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggested changes. Otherwise, LGTM

Comment threadDoc/library/sqlite3.rst Outdated
Comment threadDoc/library/sqlite3.rst Outdated
@erlend-aasland

erlend-aasland commented Aug 10, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review, CAM; PTAL before I land this.

ezio-melotti
ezio-melotti reviewed Aug 10, 2022
View reviewed changes
Comment threadDoc/library/sqlite3.rst Outdated
Comment threadDoc/library/sqlite3.rst Outdated
Erlend E. Aasland@ezio-melotti
Typo
4c85590
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
CAM-Gerlach
CAM-Gerlach reviewed Aug 11, 2022
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM otherwise, but I definitely think that the minimal example @ezio-melotti suggested would be very helpful to add here. I've made it as a suggestion.

Comment threadDoc/library/sqlite3.rst Outdated
Erlend E. Aaslandand others added 2 commits August 11, 2022 09:58
CAM-Gerlach
CAM-Gerlach approved these changes Aug 11, 2022
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

A few trivial nits, but LGTM, thanks @erlend-aasland

Comment threadDoc/library/sqlite3.rst Outdated
Comment threadLib/sqlite3/__main__.py Outdated
Comment threadDoc/library/sqlite3.rst Outdated
@erlend-aasland

erlend-aasland commented Aug 11, 2022

Copy link
Copy Markdown
ContributorAuthor

Review comments addressed. I also relocated the example; I felt it made more sense to have it just after the first paragraph.

CAM-Gerlach
CAM-Gerlach approved these changes Aug 11, 2022
View reviewed changes

@CAM-GerlachCAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks @erlend-aasland !

@erlend-aasland

erlend-aasland commented Aug 11, 2022

Copy link
Copy Markdown
ContributorAuthor

Thanks for the reviews! Now I'll fix sqlite3.complete_statement() so it correctly raises memory error on SQLITE_NO_MEM.

@erlend-aasland
erlend-aasland merged commit e6623e7 into python:mainAug 11, 2022
@miss-islington

miss-islington commented Aug 11, 2022

Copy link
Copy Markdown
Contributor

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

@erlend-aasland
erlend-aasland deleted the sqlite-reference/complete-statement branch August 11, 2022 23:05
@miss-islington

miss-islington commented Aug 11, 2022

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker e6623e7083ce08a247e5df169bcc749f99327823 3.11

@miss-islington

miss-islington commented Aug 11, 2022

Copy link
Copy Markdown
Contributor

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

@erlend-aasland

erlend-aasland commented Aug 11, 2022

Copy link
Copy Markdown
ContributorAuthor

I'll fix the backports tomorrow.

erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Aug 12, 2022
@erlend-aasland
[3.11]pythongh-95273: Improve sqlite3.complete_statement docs (pytho…
ed35c22
…nGH-95840)
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>.
(cherry picked from commit e6623e7)
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Aug 12, 2022
@bedevere-bot

bedevere-bot commented Aug 12, 2022

Copy link
Copy Markdown

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

erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Aug 12, 2022
@erlend-aasland
[3.10]pythongh-95273: Improve sqlite3.complete_statement docs (pytho…
49443c0
…nGH-95840)
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>.
(cherry picked from commit e6623e7)
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Aug 12, 2022
@bedevere-bot

bedevere-bot commented Aug 12, 2022

Copy link
Copy Markdown

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

erlend-aasland added a commit that referenced this pull request Aug 12, 2022
@erlend-aasland
[3.11]gh-95273: Improve sqlite3.complete_statement docs (GH-95840) (#…
bd86e09
…95917)
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>.
(cherry picked from commit e6623e7)
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
erlend-aasland added a commit that referenced this pull request Aug 12, 2022
@erlend-aasland
[3.10]gh-95273: Improve sqlite3.complete_statement docs (GH-95840) (#…
75299dc
…95918)
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>.
(cherry picked from commit e6623e7)
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@erlend-aaslanderlend-aasland mentioned this pull request Aug 18, 2022
Closed
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CAM-GerlachCAM-GerlachCAM-Gerlach approved these changes
@ezio-melottiezio-melottiezio-melotti approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

Assignees

@erlend-aaslanderlend-aasland

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@erlend-aasland@miss-islington@bedevere-bot@CAM-Gerlach@ezio-melotti