mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 07:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-29742: asyncio get_extra_info() throws exception (#525)

Browse source
This commit is contained in:
Nikolay Kim 2017-03-12 12:23:30 -07:00 • committed by Yury Selivanov
parent 783d0c1a1c
commit 2b27e2e6a3
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/asyncio/sslproto.py
View file

@ -543,8 +543,10 @@ class SSLProtocol(protocols.Protocol):
def _get_extra_info(self, name, default=None): def _get_extra_info(self, name, default=None):
if name in self._extra: if name in self._extra:
return self._extra[name] return self._extra[name]
else: elif self._transport is not None:
return self._transport.get_extra_info(name, default) return self._transport.get_extra_info(name, default)
else:
return default
def _start_shutdown(self): def _start_shutdown(self):
if self._in_shutdown: if self._in_shutdown:

12
Lib/test/test_asyncio/test_sslproto.py
View file

@ -95,5 +95,17 @@ class SslProtoHandshakeTests(test_utils.TestCase):
test_utils.run_briefly(self.loop) test_utils.run_briefly(self.loop)
self.assertIsInstance(waiter.exception(), ConnectionAbortedError) self.assertIsInstance(waiter.exception(), ConnectionAbortedError)
def test_get_extra_info_on_closed_connection(self):
waiter = asyncio.Future(loop=self.loop)
ssl_proto = self.ssl_protocol(waiter)
self.assertIsNone(ssl_proto._get_extra_info('socket'))
default = object()
self.assertIs(ssl_proto._get_extra_info('socket', default), default)
self.connection_made(ssl_proto)
self.assertIsNotNone(ssl_proto._get_extra_info('socket'))
ssl_proto.connection_lost(None)
self.assertIsNone(ssl_proto._get_extra_info('socket'))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

3
Misc/NEWS
View file

@ -335,6 +335,9 @@ Library
- bpo-28518: Start a transaction implicitly before a DML statement. - bpo-28518: Start a transaction implicitly before a DML statement.
Patch by Aviv Palivoda. Patch by Aviv Palivoda.
- bpo-29742: get_extra_info() raises exception if get called on closed ssl transport.
Patch by Nikolay Kim.
- Issue #16285: urrlib.parse.quote is now based on RFC 3986 and hence includes - Issue #16285: urrlib.parse.quote is now based on RFC 3986 and hence includes
'~' in the set of characters that is not quoted by default. Patch by '~' in the set of characters that is not quoted by default. Patch by
Christian Theune and Ratnadeep Debnath. Christian Theune and Ratnadeep Debnath.