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/selector_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/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 2e7364b..69b649c 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -55,8 +55,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): return _SelectorSocketTransport(self, sock, protocol, waiter, extra, server) - 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): return _SelectorSslTransport( self, rawsock, protocol, sslcontext, waiter, @@ -484,7 +484,8 @@ class _SelectorTransport(transports._FlowControlMixin, info.append('read=idle') polling = _test_selector_event(self._loop._selector, - self._sock_fd, selectors.EVENT_WRITE) + self._sock_fd, + selectors.EVENT_WRITE) if polling: state = 'polling' else: |