◐ Shell
reader mode source ↗
Skip to content

bpo-39797 Changes to socketserver.BaseServer's shutdown() method.#18929

Merged
miss-islington merged 3 commits into
python:masterfrom
amaajemyfren:socketserver_documentation_master
Mar 20, 2020
Merged

bpo-39797 Changes to socketserver.BaseServer's shutdown() method.#18929
miss-islington merged 3 commits into
python:masterfrom
amaajemyfren:socketserver_documentation_master

Conversation

@amaajemyfren

@amaajemyfren amaajemyfren commented Mar 11, 2020 •
edited by miss-islington
Loading

Copy link
Copy Markdown
Contributor

@bedevere-bot bedevere-bot added docs Documentation in the Doc dir awaiting review labels Mar 11, 2020
ned-deily
ned-deily requested changes Mar 17, 2020
View reviewed changes

@ned-deily ned-deily 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.

Hide comment

Thanks for the PR. Generally, for doc-only changes, there is no need to include a NEWS entry so please update the PR to remove it. Also as was noted elsewhere, in general you should just submit one PR and against the master branch (or whatever the highest applicable branch is). If accepted, the core developer will mark the PR to be automatically backported to appropriate maintenance branches. So I'm going to close the PRs you submitted against other branches so you don't need to update them.

@bedevere-bot

bedevere-bot commented Mar 17, 2020

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

This was referenced Mar 17, 2020
Closed
Closed
@amaajemyfren
Delete 2020-03-11-16-10-59.bpo-39797.PLnbnB.rst …
56dd881 
News is not needed for documentation PRs
@amaajemyfren

amaajemyfren commented Mar 19, 2020

Copy link
Copy Markdown
Contributor Author

Thanks for the PR. Generally, for doc-only changes, there is no need to include a NEWS entry so please update the PR to remove it.

Thanks. Will do so.

Also as was noted elsewhere, in general you should just submit one PR and against the master branch (or whatever the highest applicable branch is). If accepted, the core developer will mark the PR to be automatically backported to appropriate maintenance branches. So I'm going to close the PRs you submitted against other branches so you don't need to update them.

Thanks. I was not sure what to do and so I decided to write to the previous ones. Sorry for that.

@amaajemyfren amaajemyfren reopened this Mar 19, 2020
@amaajemyfren

amaajemyfren commented Mar 19, 2020

Copy link
Copy Markdown
Contributor Author

Apologies for closing and reopening the PR. I clicked the wrong button when responding.

@amaajemyfren

amaajemyfren commented Mar 19, 2020

Copy link
Copy Markdown
Contributor Author

I have made the requested changes; please review again

@bedevere-bot

bedevere-bot commented Mar 19, 2020

Copy link
Copy Markdown

Thanks for making the requested changes!

@ned-deily: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from ned-deily March 19, 2020 22:11
@miss-islington miss-islington merged commit 2de7ac9 into python:master Mar 20, 2020
@miss-islington

miss-islington commented Mar 20, 2020

Copy link
Copy Markdown
Contributor

Thanks @amaajemyfren for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

@bedevere-bot

bedevere-bot commented Mar 20, 2020

Copy link
Copy Markdown

GH-19085 is a backport of this pull request to the 3.8 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 20, 2020
@amaajemyfren @miss-islington
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (py… …
9b27337 
…thonGH-18929)

Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac9)

Co-authored-by: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
@bedevere-bot

bedevere-bot commented Mar 20, 2020

Copy link
Copy Markdown

GH-19086 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 20, 2020
@amaajemyfren @miss-islington
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (py… …
6cda009 
…thonGH-18929)

Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac9)

Co-authored-by: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Mar 20, 2020
@miss-islington @amaajemyfren
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH… …
64937d3 
…-18929)

Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac9)

Co-authored-by: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Mar 20, 2020
@miss-islington @amaajemyfren
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH… …
2972336 
…-18929)

Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac9)

Co-authored-by: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
@amaajemyfren amaajemyfren deleted the socketserver_documentation_master branch March 20, 2020 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ned-deily ned-deily ned-deily approved these changes

Assignees

No one assigned

Labels

docs Documentation in the Doc dir skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@amaajemyfren @bedevere-bot @miss-islington @ned-deily @the-knights-who-say-ni