diff options
| author | Nikolay Kim <fafhrd91@gmail.com> | 2017-03-12 12:23:30 -0700 |
|---|---|---|
| committer | Yury Selivanov <yselivanov@gmail.com> | 2017-03-12 15:23:30 -0400 |
| commit | 2b27e2e6a35c3d3e369612b984017fe0d1bfcf0c (patch) | |
| tree | 411f91bc286d5ea19c8e380fcd4a3e74bb4e706a | |
| parent | 783d0c1a1c723733adcdf4249240246fc35a5bcb (diff) | |
| download | cpython-git-2b27e2e6a35c3d3e369612b984017fe0d1bfcf0c.tar.gz | |
bpo-29742: asyncio get_extra_info() throws exception (#525)
| -rw-r--r-- | Lib/asyncio/sslproto.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_sslproto.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 7ad28d6aa0..ab7ff0bf93 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -543,8 +543,10 @@ class SSLProtocol(protocols.Protocol): def _get_extra_info(self, name, default=None): if name in self._extra: return self._extra[name] - else: + elif self._transport is not None: return self._transport.get_extra_info(name, default) + else: + return default def _start_shutdown(self): if self._in_shutdown: diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index 59ff0f6967..f1771c5561 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -95,5 +95,17 @@ class SslProtoHandshakeTests(test_utils.TestCase): test_utils.run_briefly(self.loop) 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__': unittest.main() @@ -335,6 +335,9 @@ Library - bpo-28518: Start a transaction implicitly before a DML statement. 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 '~' in the set of characters that is not quoted by default. Patch by Christian Theune and Ratnadeep Debnath. |