Merge 3.5 (asyncio)

This commit is contained in:
Yury Selivanov 2016-06-02 16:44:10 -04:00
commit 642afb3d3d
2 changed files with 5 additions and 1 deletions

View file

@ -102,7 +102,7 @@ def _ipaddr_info(host, port, family, type, proto):
else:
return None
if port in {None, ''}:
if port in {None, '', b''}:
port = 0
elif isinstance(port, (bytes, str)):
port = int(port)