asyncio: sync with Tulip
* Remove unused SSLProtocol._closing attribute * test_sslproto: skip test if ssl module is missing * Python issue #23208: Don't use the traceback of the current handle if we already know the traceback of the source. The handle may be more revelant, but having 3 tracebacks (handle, source, exception) becomes more difficult to read. The handle may be preferred later but it requires more work to make this choice.
This commit is contained in:
parent
b68c420d8a
commit
ff018e406c
@ -956,7 +956,8 @@ class BaseEventLoop(events.AbstractEventLoop):
|
|||||||
else:
|
else:
|
||||||
exc_info = False
|
exc_info = False
|
||||||
|
|
||||||
if (self._current_handle is not None
|
if ('source_traceback' not in context
|
||||||
|
and self._current_handle is not None
|
||||||
and self._current_handle._source_traceback):
|
and self._current_handle._source_traceback):
|
||||||
context['handle_traceback'] = self._current_handle._source_traceback
|
context['handle_traceback'] = self._current_handle._source_traceback
|
||||||
|
|
||||||
|
@ -408,7 +408,6 @@ class SSLProtocol(protocols.Protocol):
|
|||||||
self._write_buffer_size = 0
|
self._write_buffer_size = 0
|
||||||
|
|
||||||
self._waiter = waiter
|
self._waiter = waiter
|
||||||
self._closing = False
|
|
||||||
self._loop = loop
|
self._loop = loop
|
||||||
self._app_protocol = app_protocol
|
self._app_protocol = app_protocol
|
||||||
self._app_transport = _SSLProtocolTransport(self._loop,
|
self._app_transport = _SSLProtocolTransport(self._loop,
|
||||||
|
@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
try:
|
||||||
|
import ssl
|
||||||
|
except ImportError:
|
||||||
|
ssl = None
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
from asyncio import sslproto
|
from asyncio import sslproto
|
||||||
@ -14,6 +18,7 @@ class SslProtoHandshakeTests(test_utils.TestCase):
|
|||||||
self.loop = asyncio.new_event_loop()
|
self.loop = asyncio.new_event_loop()
|
||||||
self.set_event_loop(self.loop)
|
self.set_event_loop(self.loop)
|
||||||
|
|
||||||
|
@unittest.skipIf(ssl is None, 'No ssl module')
|
||||||
def test_cancel_handshake(self):
|
def test_cancel_handshake(self):
|
||||||
# Python issue #23197: cancelling an handshake must not raise an
|
# Python issue #23197: cancelling an handshake must not raise an
|
||||||
# exception or log an error, even if the handshake failed
|
# exception or log an error, even if the handshake failed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user