]> granicus.if.org Git - python/commitdiff
asyncio: _make_ssl_transport: make the waiter parameter optional
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 8 Jan 2015 11:06:36 +0000 (12:06 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 8 Jan 2015 11:06:36 +0000 (12:06 +0100)
Lib/asyncio/base_events.py
Lib/asyncio/selector_events.py

index 59f31364eccd6aa2162e809b2f519e57bc94a616..ac885a8e9ac8af73c902c66ba9cfb297ea775011 100644 (file)
@@ -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."""
index a97709d8a09f7aa5675690e6c3710bcd53477a5c..2e7364b8c80a30cb2aebdccef95e49b963e6100f 100644 (file)
@@ -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(