diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-20 21:44:44 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-20 21:44:44 (GMT) |
| commit | 010f361dadcbc9f124c7b55b5965b982d60edac8 (patch) | |
| tree | 40b459cde5dac726da8d1a93c7ea206a79e7a784 /Lib/asyncio | |
| parent | 742206d95c38f382bd02858a8c61b6cf18ac0ad0 (diff) | |
| parent | eaaaee8c569475614d16e3abf087228673bce9fc (diff) | |
| download | cpython-010f361dadcbc9f124c7b55b5965b982d60edac8.zip cpython-010f361dadcbc9f124c7b55b5965b982d60edac8.tar.gz cpython-010f361dadcbc9f124c7b55b5965b982d60edac8.tar.bz2 | |
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/base_events.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 4aac4ac..23dfef4 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -102,6 +102,11 @@ def _ipaddr_info(host, port, family, type, proto): else: return None + if port in {None, ''}: + port = 0 + elif isinstance(port, (bytes, str)): + port = int(port) + if hasattr(socket, 'inet_pton'): if family == socket.AF_UNSPEC: afs = [socket.AF_INET, socket.AF_INET6] |