Skip to content

bpo-30319: socket.close() now ignores ECONNRESET #2565

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 1 commit into from
Jul 4, 2017
Merged

bpo-30319: socket.close() now ignores ECONNRESET #2565

merged 1 commit into from
Jul 4, 2017

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Jul 4, 2017

@pitrou
Copy link
Member

pitrou commented Jul 4, 2017

Please dissociate the close() and shutdown() changes.

@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2017

Please dissociate the close() and shutdown() changes.

Done.

@vstinner vstinner requested a review from pitrou July 4, 2017 12:34
@@ -928,6 +928,9 @@ to sockets.
:exc:`OSError` is now raised if an error occurs when the underlying
:c:func:`close` call is made.

.. versionchanged:: 3.7
Copy link
Member

Choose a reason for hiding this comment

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

I think it's misleading to add a "versionchanged" here. It's just a regression that we are fixing.

Copy link
Member Author

Choose a reason for hiding this comment

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

removed

@pitrou
Copy link
Member

pitrou commented Jul 4, 2017

I think that this also needs a 3.6 backport label.

socket.close() was modified in Python 3.6 to raise OSError on
failure: see bpo-26685.
@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2017

I think that this also needs a 3.6 backport label.

I agree, I added it. I was already on the bpo.

@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2017

@pitrou: Does it look better? Now, it's hard to remove even more things from my PR!

@pitrou
Copy link
Member

pitrou commented Jul 4, 2017

Thank you! Looks good to me now.

@vstinner vstinner merged commit 67e1478 into python:master Jul 4, 2017
@vstinner vstinner deleted the socket_close branch July 4, 2017 14:20
@vstinner
Copy link
Member Author

vstinner commented Jul 4, 2017

"Thank you! Looks good to me now."

Thanks for the review @pitrou.

@bedevere-bot
Copy link

GH-2566 is a backport of this pull request to the 3.6 branch.

vstinner added a commit that referenced this pull request Jul 4, 2017
socket.close() was modified in Python 3.6 to raise OSError on
failure: see bpo-26685.
(cherry picked from commit 67e1478)
vstinner added a commit that referenced this pull request Jul 5, 2017
vstinner added a commit that referenced this pull request Jul 5, 2017
* Revert "bpo-30854: Fix compile error when --without-threads (#2581)"

This reverts commit 0c31163.

* Revert "NEWS for 30777 (#2576)"

This reverts commit aaa917f.

* Revert "bpo-21624: IDLE -- minor htest fixes (#2575)"

This reverts commit 2000150.

* Revert "bpo-30777: IDLE: configdialog - add docstrings and improve comments (#2440)"

This reverts commit 7eb5883.

* Revert "bpo-30319: socket.close() now ignores ECONNRESET (#2565)"

This reverts commit 67e1478.

* Revert "bpo-30789: Use a single memory block for co_extra. (#2555)"

This reverts commit 378ebb6.

* Revert "bpo-30845: Enhance test_concurrent_futures cleanup (#2564)"

This reverts commit 3df9dec.

* Revert "bpo-29293: multiprocessing.Condition.notify() lacks parameter `n` (#2480)"

This reverts commit 4835041.

* Revert "Remove outdated FOX from GUI FAQ (GH-2538)"

This reverts commit d3ed287.

* Revert "bpo-6691: Pyclbr now reports nested classes and functions. (#2503)"

This reverts commit 246ff3b.

* Revert "bpo-29464: Rename METH_FASTCALL to METH_FASTCALL|METH_KEYWORDS and make (#1955)"

This reverts commit 6969eaf.

* Revert "bpo-30832: Remove own implementation for thread-local storage (#2537)"

This reverts commit aa0aa04.

* Revert "bpo-30764: Fix regrtest --fail-env-changed --forever (#2536)"

This reverts commit 5e87592.

* Revert "bpo-30822: Deduplicate ZoneInfoTest classes in test_datetime. (#2534)"

This reverts commit 34b5487.

* Revert "bpo-30822: Fix testing of datetime module. (#2530)"

This reverts commit 98b6bc3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants