diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 23:05:18 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 23:05:18 (GMT) |
| commit | 93e42c03b78fdb6b51153e5825ab9dc9f90b5e16 (patch) | |
| tree | c9573bfd60c30ce8f92f20ebc6746f58861371cc /Lib/asyncio/selector_events.py | |
| parent | 24be20ac1c396a961d5546d3a641fbcc0bc8108b (diff) | |
| parent | 29ad0111bd8c7edd049c964c66cfb9e9114c99d2 (diff) | |
| download | cpython-93e42c03b78fdb6b51153e5825ab9dc9f90b5e16.zip cpython-93e42c03b78fdb6b51153e5825ab9dc9f90b5e16.tar.gz cpython-93e42c03b78fdb6b51153e5825ab9dc9f90b5e16.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 074a8df..4d3e5d9 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -182,13 +182,14 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): else: raise # The event loop will catch, log and ignore it. else: + protocol = protocol_factory() if sslcontext: self._make_ssl_transport( - conn, protocol_factory(), sslcontext, + conn, protocol, sslcontext, server_side=True, extra={'peername': addr}, server=server) else: self._make_socket_transport( - conn, protocol_factory(), extra={'peername': addr}, + conn, protocol , extra={'peername': addr}, server=server) # It's now up to the protocol to handle the connection. |