diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 12:05:43 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 12:05:43 +0100 |
| commit | 63a982e414b7b93b7e471340b07479c8c145ef71 (patch) | |
| tree | 34a57119219cf62e90367fccb7df6390a4c408c6 | |
| parent | a63d7997461ea89635b9dd05009f2f8e73331de1 (diff) | |
| download | trollius-63a982e414b7b93b7e471340b07479c8c145ef71.tar.gz | |
_make_ssl_transport: make the waiter parameter optional
| -rw-r--r-- | asyncio/base_events.py | 2 | ||||
| -rw-r--r-- | asyncio/selector_events.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asyncio/base_events.py b/asyncio/base_events.py index 59f3136..ac885a8 100644 --- a/asyncio/base_events.py +++ b/asyncio/base_events.py @@ -201,7 +201,7 @@ class BaseEventLoop(events.AbstractEventLoop): """Create socket transport.""" raise NotImplementedError - def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter, *, + def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, *, server_side=False, server_hostname=None, extra=None, server=None): """Create SSL transport.""" diff --git a/asyncio/selector_events.py b/asyncio/selector_events.py index a97709d..2e7364b 100644 --- a/asyncio/selector_events.py +++ b/asyncio/selector_events.py @@ -55,7 +55,7 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): return _SelectorSocketTransport(self, sock, protocol, waiter, extra, server) - def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter, *, + def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, *, server_side=False, server_hostname=None, extra=None, server=None): return _SelectorSslTransport( @@ -165,7 +165,7 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): else: if sslcontext: self._make_ssl_transport( - conn, protocol_factory(), sslcontext, None, + conn, protocol_factory(), sslcontext, server_side=True, extra={'peername': addr}, server=server) else: self._make_socket_transport( |