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-95273: Improve sqlite3.complete_statement docs #95840

Merged
merged 6 commits into from
Aug 11, 2022
Merged

gh-95273: Improve sqlite3.complete_statement docs #95840

merged 6 commits into from
Aug 11, 2022

Conversation

erlend-aasland
Copy link
Contributor

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

@erlend-aasland erlend-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
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

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

Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor Author

erlend-aasland commented Aug 10, 2022 •
edited
Loading

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

ezio-melotti
ezio-melotti reviewed Aug 10, 2022
View reviewed changes
Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
@ezio-melotti
Typo
4c85590 
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
CAM-Gerlach
CAM-Gerlach reviewed Aug 11, 2022
View reviewed changes
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

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.

Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
Erlend E. Aasland and others added 2 commits August 11, 2022 09:58
CAM-Gerlach
CAM-Gerlach approved these changes Aug 11, 2022
View reviewed changes
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

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

Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
Lib/sqlite3/__main__.py Outdated Show resolved Hide resolved
Doc/library/sqlite3.rst Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor Author

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

@CAM-Gerlach CAM-Gerlach left a comment

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
Copy link
Contributor Author

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:main Aug 11, 2022
@miss-islington
Copy link
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
Copy link
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
Copy link
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
Copy link
Contributor Author

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-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Aug 12, 2022
@bedevere-bot
Copy link

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-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Aug 12, 2022
@bedevere-bot
Copy link

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-aasland erlend-aasland mentioned this pull request Aug 18, 2022
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CAM-Gerlach CAM-Gerlach CAM-Gerlach approved these changes

@ezio-melotti ezio-melotti ezio-melotti approved these changes

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

Assignees

@erlend-aasland erlend-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