diff options
| author | Yury Selivanov <yury@magic.io> | 2016-06-28 15:00:39 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-06-28 15:00:39 (GMT) |
| commit | 5eef78b1131bb720f7384b29ae99f0285d2d7fa8 (patch) | |
| tree | 284291a25ef380cf2aaaf84b0333027c2cfbef5c /Lib/asyncio | |
| parent | 7c6b3ea48c4336a83a364f588ee1a0ce71230f73 (diff) | |
| parent | 63bf48768867a7421f8ccb956fe77f295bfd2742 (diff) | |
| download | cpython-5eef78b1131bb720f7384b29ae99f0285d2d7fa8.zip cpython-5eef78b1131bb720f7384b29ae99f0285d2d7fa8.tar.gz cpython-5eef78b1131bb720f7384b29ae99f0285d2d7fa8.tar.bz2 | |
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 6650da2..34cce6b 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -394,7 +394,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): if hasattr(socket, 'AF_UNIX') and sock.family == socket.AF_UNIX: self._sock_connect(fut, sock, address) else: - resolved = base_events._ensure_resolved(address, loop=self) + resolved = base_events._ensure_resolved( + address, family=sock.family, proto=sock.proto, loop=self) resolved.add_done_callback( lambda resolved: self._on_resolved(fut, sock, resolved)) |