Skip to content

bpo-46878: Purge 'non-standard' from sqlite3 docstrings - #31612

Merged
JelleZijlstra merged 1 commit into
python:mainfrom
erlend-aasland:sqlite-non-standard
Mar 8, 2022
Merged

bpo-46878: Purge 'non-standard' from sqlite3 docstrings#31612
JelleZijlstra merged 1 commit into
python:mainfrom
erlend-aasland:sqlite-non-standard

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Feb 28, 2022•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@erlend-aaslanderlend-aasland mentioned this pull request Feb 28, 2022
Merged
@AlexWaygoodAlexWaygood added the docs Documentation in the Doc dir label Feb 28, 2022
@JelleZijlstraJelleZijlstra self-assigned this Feb 28, 2022
JelleZijlstra
JelleZijlstra approved these changes Mar 2, 2022
View reviewed changes

@JelleZijlstraJelleZijlstra 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.

Looks good, thanks.

Do you think we should backport this change? I imagine it will make future backports easier if we keep the docstrings similar.

Comment threadModules/_sqlite/module.c
@erlend-aasland

erlend-aasland commented Mar 2, 2022

Copy link
Copy Markdown
ContributorAuthor

Looks good, thanks.

Thanks for reviewing! Much appreciated.

Do you think we should backport this change? I imagine it will make future backports easier if we keep the docstrings similar.

Definitely.

@JelleZijlstra

JelleZijlstra commented Mar 8, 2022

Copy link
Copy Markdown
Member

Going to merge this change soon (cc @gvanrossum).

@JelleZijlstra
JelleZijlstra merged commit 4d95fa1 into python:mainMar 8, 2022
@miss-islington

miss-islington commented Mar 8, 2022

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

miss-islington commented Mar 8, 2022

Copy link
Copy Markdown
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 4d95fa1ac5d31ff450fb2f31b55ce1eb99d6efcb 3.10

@miss-islington

miss-islington commented Mar 8, 2022

Copy link
Copy Markdown
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 4d95fa1ac5d31ff450fb2f31b55ce1eb99d6efcb 3.9

@erlend-aasland
erlend-aasland deleted the sqlite-non-standard branch March 8, 2022 08:25
@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Mar 8, 2022
@bedevere-bot

bedevere-bot commented Mar 8, 2022

Copy link
Copy Markdown

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

@erlend-aaslanderlend-aasland mentioned this pull request Mar 8, 2022
Merged
@bedevere-bot

bedevere-bot commented Mar 8, 2022

Copy link
Copy Markdown

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

@erlend-aaslanderlend-aasland mentioned this pull request Mar 8, 2022
Merged
miss-islington pushed a commit that referenced this pull request Mar 8, 2022
Erlend Egeberg Aasland
[3.10]bpo-46878: Purge 'non-standard' from sqlite3 docstrings (GH-31612
f3d3b2d
) (GH-31753)
(cherry picked from commit 4d95fa1)
miss-islington pushed a commit that referenced this pull request Mar 8, 2022
Erlend Egeberg Aasland
[3.9]bpo-46878: Purge 'non-standard' from sqlite3 docstrings (GH-31612…
653ca6c
…) (GH-31754)
(cherry picked from commit 4d95fa1)
@erlend-aaslanderlend-aasland mentioned this pull request Apr 10, 2022
Closed
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
Erlend Egeberg Aasland@hello-adam
[3.9] bpo-46878: Purge 'non-standard' from sqlite3 docstrings (python…
fbff1e0
…GH-31612) (pythonGH-31754)
(cherry picked from commit 4d95fa1)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpsheadgpsheadgpshead approved these changes
@JelleZijlstraJelleZijlstraJelleZijlstra approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

Assignees

@JelleZijlstraJelleZijlstra

Labels

docsDocumentation in the Doc dirskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@erlend-aasland@JelleZijlstra@miss-islington@bedevere-bot@gpshead@the-knights-who-say-ni@AlexWaygood