Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 (asyncio)

This commit is contained in:
Victor Stinner 2015-01-28 00:30:51 +01:00
parent 07f0515667 ff018e406c
commit bf9765186d
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/asyncio/base_events.py
View File

@ -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

1
Lib/asyncio/sslproto.py
View File

@ -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,

5
Lib/test/test_asyncio/test_sslproto.py
View File

@ -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