From a8f895f051588cc5186650f13118b0149ae7e3d5 Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Thu, 2 Jun 2016 16:43:52 -0400 Subject: asyncio: Support host=b'' for getaddrinfo --- Lib/asyncio/base_events.py | 2 +- Lib/test/test_asyncio/test_base_events.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index ac1089a..e5feb99 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -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) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 678ba30..81c35c8 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -132,6 +132,10 @@ class BaseEventTests(test_utils.TestCase): 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)) self.assertEqual( -- cgit v0.12