[Python-checkins] cpython (3.4): asyncio: _make_ssl_transport: make the waiter parameter optional

Thu Jan 8 12:08:46 CET 2015

https://hg.python.org/cpython/rev/f12b845a46c0
changeset: 94078:f12b845a46c0
branch: 3.4
parent: 94076:364e44a49a31
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Jan 08 12:06:36 2015 +0100
summary:
 asyncio: _make_ssl_transport: make the waiter parameter optional
files:
 Lib/asyncio/base_events.py | 2 +-
 Lib/asyncio/selector_events.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -201,7 +201,7 @@
 """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/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -55,7 +55,7 @@
 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 @@
 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(
-- 
Repository URL: https://hg.python.org/cpython
