diff options
author | Yury Selivanov <yselivanov@sprymix.com> | 2016-06-02 20:44:10 (GMT) |
---|---|---|
committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-06-02 20:44:10 (GMT) |
commit | 642afb3d3dcb5bcd359047d396343a1b3ca8370b (patch) | |
tree | 3b8d1cc8704e833b3aebc5fe397017e0febe2fa3 /Lib/asyncio | |
parent | fddf12198fa43d411abb232c3ce8e97290717bfb (diff) | |
parent | a8f895f051588cc5186650f13118b0149ae7e3d5 (diff) | |
download | cpython-642afb3d3dcb5bcd359047d396343a1b3ca8370b.zip cpython-642afb3d3dcb5bcd359047d396343a1b3ca8370b.tar.gz cpython-642afb3d3dcb5bcd359047d396343a1b3ca8370b.tar.bz2 |
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/asyncio')
-rw-r--r-- | Lib/asyncio/base_events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index cb845d9..41dd681 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) |