diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-10-19 18:12:44 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2017-10-19 18:12:44 (GMT) |
| commit | 9c23b173b823b5e6da01d85c570c7ae2ab07b38b (patch) | |
| tree | 26b428d9ac292c58b08c653f9c5888b06ad66d33 /Lib | |
| parent | 4d9a8f22999de489ede9216ff983d4359d837760 (diff) | |
| download | cpython-9c23b173b823b5e6da01d85c570c7ae2ab07b38b.zip cpython-9c23b173b823b5e6da01d85c570c7ae2ab07b38b.tar.gz cpython-9c23b173b823b5e6da01d85c570c7ae2ab07b38b.tar.bz2 | |
bpo-31632: fix set_protocol() in _SSLProtocolTransport (GH-3817) (GH-3817) (#4052)
(cherry picked from commit ea2ef5d0ca869d4550820ed53bdf56013dbb9546)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/sslproto.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_sslproto.py | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 7948c4c..f4d8a48 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -294,11 +294,10 @@ class _SSLPipe(object): class _SSLProtocolTransport(transports._FlowControlMixin, transports.Transport): - def __init__(self, loop, ssl_protocol, app_protocol): + def __init__(self, loop, ssl_protocol): self._loop = loop # SSLProtocol instance self._ssl_protocol = ssl_protocol - self._app_protocol = app_protocol self._closed = False def get_extra_info(self, name, default=None): @@ -306,10 +305,10 @@ class _SSLProtocolTransport(transports._FlowControlMixin, return self._ssl_protocol._get_extra_info(name, default) def set_protocol(self, protocol): - self._app_protocol = protocol + self._ssl_protocol._app_protocol = protocol def get_protocol(self): - return self._app_protocol + return self._ssl_protocol._app_protocol def is_closing(self): return self._closed @@ -436,8 +435,7 @@ class SSLProtocol(protocols.Protocol): self._waiter = waiter self._loop = loop self._app_protocol = app_protocol - self._app_transport = _SSLProtocolTransport(self._loop, - self, self._app_protocol) + self._app_transport = _SSLProtocolTransport(self._loop, self) # _SSLPipe instance (None until the connection is made) self._sslpipe = None self._session_established = False diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index bcd236e..f573ae8 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -121,6 +121,14 @@ class SslProtoHandshakeTests(test_utils.TestCase): ssl_proto.connection_lost(None) self.assertIsNone(ssl_proto._get_extra_info('socket')) + def test_set_new_app_protocol(self): + waiter = asyncio.Future(loop=self.loop) + ssl_proto = self.ssl_protocol(waiter) + new_app_proto = asyncio.Protocol() + ssl_proto._app_transport.set_protocol(new_app_proto) + self.assertIs(ssl_proto._app_transport.get_protocol(), new_app_proto) + self.assertIs(ssl_proto._app_protocol, new_app_proto) + if __name__ == '__main__': unittest.main() |