diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 11:07:00 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 11:07:00 (GMT) |
| commit | 540373310ea0c99a468cbeb140de97f9292eba2e (patch) | |
| tree | 6a41b3fed13c64816423a6fd66aa479c7f2aed78 /Lib/asyncio/selector_events.py | |
| parent | ef50fdf13817dd09389aa693669dca83e3618a15 (diff) | |
| parent | 8d9c145f61d43fb9d43ad43c04744ffd32c93d8c (diff) | |
| download | cpython-540373310ea0c99a468cbeb140de97f9292eba2e.zip cpython-540373310ea0c99a468cbeb140de97f9292eba2e.tar.gz cpython-540373310ea0c99a468cbeb140de97f9292eba2e.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index a97709d..2e7364b 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/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( |