mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 12:16:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-33769: start_tls: Fix error message; cancel callbacks on error (GH-7403)

Browse source 
In addition to that, mark SSLTransport as "closed" in its "abort()" method to prevent bogus warnings.
This commit is contained in:
Yury Selivanov 2018-06-05 08:59:58 -04:00 • committed by GitHub
parent e9e3976057
commit 415bc46a78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/asyncio/base_events.py
View file

@ -1097,7 +1097,7 @@ class BaseEventLoop(events.AbstractEventLoop):
if not getattr(transport, '_start_tls_compatible', False):
raise TypeError(
f'transport {self!r} is not supported by start_tls()')
f'transport {transport!r} is not supported by start_tls()')
waiter = self.create_future()
ssl_protocol = sslproto.SSLProtocol(
@ -1111,13 +1111,15 @@ class BaseEventLoop(events.AbstractEventLoop):
transport.pause_reading()
transport.set_protocol(ssl_protocol)
self.call_soon(ssl_protocol.connection_made, transport)
self.call_soon(transport.resume_reading)
conmade_cb = self.call_soon(ssl_protocol.connection_made, transport)
resume_cb = self.call_soon(transport.resume_reading)
try:
await waiter
except Exception:
transport.close()
conmade_cb.cancel()
resume_cb.cancel()
raise
return ssl_protocol._app_transport