Skip to content

Docstring: replace pysqlite with sqlite3 #31758

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.

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

Merged
merged 3 commits into from
Mar 9, 2022

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Mar 8, 2022

Replace two instances of "pysqlite" with "sqlite3" in sqlite3 docstrings.
Also align the docs with the docstrings for the two affected methods.

Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword the same docstring with "does nothing" to "is a
no-op" to align them with the docs.
@erlend-aasland
Copy link
Contributor Author

@JelleZijlstra: I believe this is one of the rare cases where skip issue can be applied. Please shout out if you disagree.

@JelleZijlstra JelleZijlstra self-assigned this Mar 8, 2022
@erlend-aasland
Copy link
Contributor Author

We could backport this.

@JelleZijlstra JelleZijlstra added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Mar 8, 2022
Copy link
Member

@JelleZijlstra JelleZijlstra left a comment

Choose a reason for hiding this comment

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

Agree. @gvanrossum planning to merge this minor sqlite change

@JelleZijlstra JelleZijlstra merged commit b33a1ae into python:main Mar 9, 2022
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland and @JelleZijlstra, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker b33a1ae703338e09dc0af5fbfd8ffa01d3ff75da 3.10

@miss-islington
Copy link
Contributor

Sorry @erlend-aasland and @JelleZijlstra, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker b33a1ae703338e09dc0af5fbfd8ffa01d3ff75da 3.9

@JelleZijlstra
Copy link
Member

I'll backport

JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 9, 2022
Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity..
(cherry picked from commit b33a1ae)

Co-authored-by: Erlend Egeberg Aasland <[email protected]>
@bedevere-bot
Copy link

GH-31777 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 Mar 9, 2022
@bedevere-bot
Copy link

GH-31778 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Mar 9, 2022
JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 9, 2022
Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity..
(cherry picked from commit b33a1ae)

Co-authored-by: Erlend Egeberg Aasland <[email protected]>
asvetlov pushed a commit that referenced this pull request Mar 9, 2022
Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity.
JelleZijlstra added a commit that referenced this pull request Mar 9, 2022
Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity..
(cherry picked from commit b33a1ae)

Co-authored-by: Erlend Egeberg Aasland <[email protected]>
JelleZijlstra added a commit that referenced this pull request Mar 9, 2022
Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity..
(cherry picked from commit b33a1ae)

Co-authored-by: Erlend Egeberg Aasland <[email protected]>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
…onGH-31778)

Replace two instances of "pysqlite" with "sqlite3" in sqlite3
docstrings. Also reword "is a no-op" to "does nothing" for clarity..
(cherry picked from commit b33a1ae)

Co-authored-by: Erlend Egeberg Aasland <[email protected]>
@erlend-aasland erlend-aasland deleted the sqlite-pysqlite branch July 4, 2023 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants