languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-20 11:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3.5 (asyncio)

Browse source
This commit is contained in:
Yury Selivanov 2016-06-02 16:44:10 -04:00
parent fddf12198f a8f895f051
commit 642afb3d3d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lib/asyncio/base_events.py
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)

4
Lib/test/test_asyncio/test_base_events.py
View file

@ -130,6 +130,10 @@ def test_port_parameter_types(self):
(INET, STREAM, TCP, '', ('1.2.3.4', 0)),
base_events._ipaddr_info('1.2.3.4', None, INET, STREAM, TCP))
self.assertEqual(
(INET, STREAM, TCP, '', ('1.2.3.4', 0)),
base_events._ipaddr_info('1.2.3.4', b'', INET, STREAM, TCP))
self.assertEqual(
(INET, STREAM, TCP, '', ('1.2.3.4', 0)),
base_events._ipaddr_info('1.2.3.4', '', INET, STREAM, TCP))