NotificationsYou must be signed in to change notification settings
Fork32k
Star67.2k

Commitc647ad9

authored

Revert "bpo-36801: Fix waiting in StreamWriter.drain for closing SSL transport (GH-13098)" (GH-13328)

This reverts commit93aa57a.

1 parent2fef5b0 commitc647ad9Copy full SHA for c647ad9

File tree

4 files changed

-46

lines changed

Lib
- asyncio
  - streams.py
  - subprocess.py
- test/test_asyncio
  - test_streams.py
Misc/NEWS.d/next/Library
- 2019-05-05-09-45-44.bpo-36801.XrlFFs.rst

4 files changed

-46

lines changed

`‎Lib/asyncio/streams.py`

Lines changed: 8 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,6 @@ async def _drain_helper(self):`
`208`	`208`	`self._drain_waiter=waiter`
`209`	`209`	`awaitwaiter`
`210`	`210`
`211`		`-def_get_close_waiter(self,stream):`
`212`		`-raiseNotImplementedError`
`213`		`-`
`214`	`211`
`215`	`212`	`classStreamReaderProtocol(FlowControlMixin,protocols.Protocol):`
`216`	`213`	`"""Helper class to adapt between Protocol and StreamReader.`
`@@ -268,9 +265,6 @@ def eof_received(self):`
`268`	`265`	`returnFalse`
`269`	`266`	`returnTrue`
`270`	`267`
`271`		`-def_get_close_waiter(self,stream):`
`272`		`-returnself._closed`
`273`		`-`
`274`	`268`	`def__del__(self):`
`275`	`269`	`# Prevent reports about unhandled exceptions.`
`276`	`270`	`# Better than self._closed._log_traceback = False hack`
`@@ -326,7 +320,7 @@ def is_closing(self):`
`326`	`320`	`returnself._transport.is_closing()`
`327`	`321`
`328`	`322`	`asyncdefwait_closed(self):`
`329`		`-awaitself._protocol._get_close_waiter(self)`
	`323`	`+awaitself._protocol._closed`
`330`	`324`
`331`	`325`	`defget_extra_info(self,name,default=None):`
`332`	`326`	`returnself._transport.get_extra_info(name,default)`
`@@ -344,12 +338,13 @@ async def drain(self):`
`344`	`338`	`ifexcisnotNone:`
`345`	`339`	`raiseexc`
`346`	`340`	`ifself._transport.is_closing():`
`347`		`-# Wait for protocol.connection_lost() call`
`348`		`-# Raise connection closing error if any,`
`349`		`-# ConnectionResetError otherwise`
`350`		`-fut=self._protocol._get_close_waiter(self)`
`351`		`-awaitfut`
`352`		`-raiseConnectionResetError('Connection lost')`
	`341`	`+# Yield to the event loop so connection_lost() may be`
	`342`	`+# called. Without this, _drain_helper() would return`
	`343`	`+# immediately, and code that calls`
	`344`	`+# write(...); await drain()`
	`345`	`+# in a loop would never call connection_lost(), so it`
	`346`	`+# would not see an error when the socket is closed.`
	`347`	`+awaitsleep(0,loop=self._loop)`
`353`	`348`	`awaitself._protocol._drain_helper()`
`354`	`349`
`355`	`350`

`‎Lib/asyncio/subprocess.py`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ def __init__(self, limit, loop):`
`25`	`25`	`self._transport=None`
`26`	`26`	`self._process_exited=False`
`27`	`27`	`self._pipe_fds= []`
`28`		`-self._stdin_closed=self._loop.create_future()`
`29`	`28`
`30`	`29`	`def__repr__(self):`
`31`	`30`	`info= [self.__class__.__name__]`
`@@ -77,10 +76,6 @@ def pipe_connection_lost(self, fd, exc):`
`77`	`76`	`ifpipeisnotNone:`
`78`	`77`	`pipe.close()`
`79`	`78`	`self.connection_lost(exc)`
`80`		`-ifexcisNone:`
`81`		`-self._stdin_closed.set_result(None)`
`82`		`-else:`
`83`		`-self._stdin_closed.set_exception(exc)`
`84`	`79`	`return`
`85`	`80`	`iffd==1:`
`86`	`81`	`reader=self.stdout`
`@@ -107,10 +102,6 @@ def _maybe_close_transport(self):`
`107`	`102`	`self._transport.close()`
`108`	`103`	`self._transport=None`
`109`	`104`
`110`		`-def_get_close_waiter(self,stream):`
`111`		`-ifstreamisself.stdin:`
`112`		`-returnself._stdin_closed`
`113`		`-`
`114`	`105`
`115`	`106`	`classProcess:`
`116`	`107`	`def__init__(self,transport,protocol,loop):`

`‎Lib/test/test_asyncio/test_streams.py`

Lines changed: 0 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,29 +99,6 @@ def test_open_unix_connection_no_loop_ssl(self):`
`99`	`99`
`100`	`100`	`self._basetest_open_connection_no_loop_ssl(conn_fut)`
`101`	`101`
`102`		`-@unittest.skipIf(sslisNone,'No ssl module')`
`103`		`-deftest_drain_on_closed_writer_ssl(self):`
`104`		`-`
`105`		`-asyncdefinner(httpd):`
`106`		`-reader,writer=awaitasyncio.open_connection(`
`107`		`-*httpd.address,`
`108`		`-ssl=test_utils.dummy_ssl_context())`
`109`		`-`
`110`		`-messages= []`
`111`		`-self.loop.set_exception_handler(lambdaloop,ctx:messages.append(ctx))`
`112`		`-writer.write(b'GET / HTTP/1.0\r\n\r\n')`
`113`		`-data=awaitreader.read()`
`114`		`-self.assertTrue(data.endswith(b'\r\n\r\nTest message'))`
`115`		`-`
`116`		`-writer.close()`
`117`		`-withself.assertRaises(ConnectionResetError):`
`118`		`-awaitwriter.drain()`
`119`		`-`
`120`		`-self.assertEqual(messages, [])`
`121`		`-`
`122`		`-withtest_utils.run_test_server(use_ssl=True)ashttpd:`
`123`		`-self.loop.run_until_complete(inner(httpd))`
`124`		`-`
`125`	`102`	`def_basetest_open_connection_error(self,open_connection_fut):`
`126`	`103`	`reader,writer=self.loop.run_until_complete(open_connection_fut)`
`127`	`104`	`writer._protocol.connection_lost(ZeroDivisionError())`

`‎Misc/NEWS.d/next/Library/2019-05-05-09-45-44.bpo-36801.XrlFFs.rst`

Lines changed: 0 additions & 1 deletion

This file was deleted.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc647ad9

File tree

4 files changed

4 files changed

`‎Lib/asyncio/streams.py`

`‎Lib/asyncio/subprocess.py`

`‎Lib/test/test_asyncio/test_streams.py`

`‎Misc/NEWS.d/next/Library/2019-05-05-09-45-44.bpo-36801.XrlFFs.rst`

0 commit comments