diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 23:09:35 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-08 23:09:35 (GMT) |
| commit | 12985b5da76d7737a79e471f96ee05303bf1ea25 (patch) | |
| tree | 0d230536e8af04c7d7dc2a085d057da3d8467bae /Lib/asyncio/base_events.py | |
| parent | 540373310ea0c99a468cbeb140de97f9292eba2e (diff) | |
| parent | 15cc678d8971f5ee1a7ea5e88bcd22413601f033 (diff) | |
| download | cpython-12985b5da76d7737a79e471f96ee05303bf1ea25.zip cpython-12985b5da76d7737a79e471f96ee05303bf1ea25.tar.gz cpython-12985b5da76d7737a79e471f96ee05303bf1ea25.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/base_events.py')
| -rw-r--r-- | Lib/asyncio/base_events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index ac885a8..35c8d74 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -201,8 +201,8 @@ class BaseEventLoop(events.AbstractEventLoop): """Create socket transport.""" raise NotImplementedError - def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, *, - server_side=False, server_hostname=None, + def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, + *, server_side=False, server_hostname=None, extra=None, server=None): """Create SSL transport.""" raise NotImplementedError |