Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 (asyncio)

This commit is contained in:
Victor Stinner 2015-01-08 12:07:00 +01:00
parent ef50fdf138 8d9c145f61
commit 540373310e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/asyncio/base_events.py
View File

@ -201,7 +201,7 @@ class BaseEventLoop(events.AbstractEventLoop):
"""Create socket transport.""" """Create socket transport."""
raise NotImplementedError 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, server_side=False, server_hostname=None,
extra=None, server=None): extra=None, server=None):
"""Create SSL transport.""" """Create SSL transport."""

4
Lib/asyncio/selector_events.py
View File

@ -55,7 +55,7 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
return _SelectorSocketTransport(self, sock, protocol, waiter, return _SelectorSocketTransport(self, sock, protocol, waiter,
extra, server) 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, server_side=False, server_hostname=None,
extra=None, server=None): extra=None, server=None):
return _SelectorSslTransport( return _SelectorSslTransport(
@ -165,7 +165,7 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
else: else:
if sslcontext: if sslcontext:
self._make_ssl_transport( self._make_ssl_transport(
conn, protocol_factory(), sslcontext, None, conn, protocol_factory(), sslcontext,
server_side=True, extra={'peername': addr}, server=server) server_side=True, extra={'peername': addr}, server=server)
else: else:
self._make_socket_transport( self._make_socket_transport(