diff options
| author | Pablo Galindo <Pablogsal@gmail.com> | 2021-05-03 15:21:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 15:21:59 (GMT) |
| commit | 7719953b30430b351ba0f153c2b51b16cc68ee36 (patch) | |
| tree | 8014086b85a13ed79d45e29ab74a9a9f5c9c68eb /Lib/asyncio/proactor_events.py | |
| parent | 39494285e15dc2d291ec13de5045b930eaf0a3db (diff) | |
| download | cpython-7719953b30430b351ba0f153c2b51b16cc68ee36.zip cpython-7719953b30430b351ba0f153c2b51b16cc68ee36.tar.gz cpython-7719953b30430b351ba0f153c2b51b16cc68ee36.tar.bz2 | |
bpo-44011: Revert "New asyncio ssl implementation (GH-17975)" (GH-25848)
This reverts commit 5fb06edbbb769561e245d0fe13002bab50e2ae60 and all
subsequent dependent commits.
Diffstat (limited to 'Lib/asyncio/proactor_events.py')
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 10852af..45c11ee 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -642,13 +642,11 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): self, rawsock, protocol, sslcontext, waiter=None, *, server_side=False, server_hostname=None, extra=None, server=None, - ssl_handshake_timeout=None, - ssl_shutdown_timeout=None): + ssl_handshake_timeout=None): ssl_protocol = sslproto.SSLProtocol( self, protocol, sslcontext, waiter, server_side, server_hostname, - ssl_handshake_timeout=ssl_handshake_timeout, - ssl_shutdown_timeout=ssl_shutdown_timeout) + ssl_handshake_timeout=ssl_handshake_timeout) _ProactorSocketTransport(self, rawsock, ssl_protocol, extra=extra, server=server) return ssl_protocol._app_transport @@ -814,8 +812,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): def _start_serving(self, protocol_factory, sock, sslcontext=None, server=None, backlog=100, - ssl_handshake_timeout=None, - ssl_shutdown_timeout=None): + ssl_handshake_timeout=None): def loop(f=None): try: @@ -829,8 +826,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): self._make_ssl_transport( conn, protocol, sslcontext, server_side=True, extra={'peername': addr}, server=server, - ssl_handshake_timeout=ssl_handshake_timeout, - ssl_shutdown_timeout=ssl_shutdown_timeout) + ssl_handshake_timeout=ssl_handshake_timeout) else: self._make_socket_transport( conn, protocol, |