mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.5 (asyncio)

Browse source
This commit is contained in:
Yury Selivanov 2016-06-02 16:51:27 -04:00
commit 1f56e5f6af
2 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/asyncio/base_events.py
View file

@ -102,10 +102,26 @@ def _ipaddr_info(host, port, family, type, proto):
else:
return None
if port in {None, '', b''}:
if port is None:
port = 0
elif isinstance(port, (bytes, str)):
port = int(port)
elif isinstance(port, bytes):
if port == b'':
port = 0
else:
try:
port = int(port)
except ValueError:
# Might be a service name like b"http".
port = socket.getservbyname(port.decode('ascii'))
elif isinstance(port, str):
if port == '':
port = 0
else:
try:
port = int(port)
except ValueError:
# Might be a service name like "http".
port = socket.getservbyname(port)
if hasattr(socket, 'inet_pton'):
if family == socket.AF_UNSPEC: