summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2018-05-29 09:02:40 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2018-05-29 09:02:40 (GMT)
commit2179022d94937d7b0600b0dc192ca6fa5f53d830 (patch)
tree7d548110d8138728e42d5621a0a38424abd47bcd /Lib/asyncio
parentf295587c45f96b62d24f9a12cef6931b0805f596 (diff)
downloadcpython-2179022d94937d7b0600b0dc192ca6fa5f53d830.zip
cpython-2179022d94937d7b0600b0dc192ca6fa5f53d830.tar.gz
cpython-2179022d94937d7b0600b0dc192ca6fa5f53d830.tar.bz2
bpo-33654: Support protocol type switching in SSLTransport.set_protocol() (#7194)
Diffstat (limited to 'Lib/asyncio')
-rw-r--r--Lib/asyncio/sslproto.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index ab43e93..a6d382e 100644
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -295,7 +295,7 @@ class _SSLProtocolTransport(transports._FlowControlMixin,
return self._ssl_protocol._get_extra_info(name, default)
def set_protocol(self, protocol):
- self._ssl_protocol._app_protocol = protocol
+ self._ssl_protocol._set_app_protocol(protocol)
def get_protocol(self):
return self._ssl_protocol._app_protocol
@@ -440,9 +440,7 @@ class SSLProtocol(protocols.Protocol):
self._waiter = waiter
self._loop = loop
- self._app_protocol = app_protocol
- self._app_protocol_is_buffer = \
- isinstance(app_protocol, protocols.BufferedProtocol)
+ self._set_app_protocol(app_protocol)
self._app_transport = _SSLProtocolTransport(self._loop, self)
# _SSLPipe instance (None until the connection is made)
self._sslpipe = None
@@ -454,6 +452,11 @@ class SSLProtocol(protocols.Protocol):
self._call_connection_made = call_connection_made
self._ssl_handshake_timeout = ssl_handshake_timeout
+ def _set_app_protocol(self, app_protocol):
+ self._app_protocol = app_protocol
+ self._app_protocol_is_buffer = \
+ isinstance(app_protocol, protocols.BufferedProtocol)
+
def _wakeup_waiter(self, exc=None):
if self._waiter is None:
return