Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1f56e5f6
Commit
1f56e5f6
authored
Jun 02, 2016
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Plain Diff
Merge 3.5 (asyncio)
parents
642afb3d
a714616d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
3 deletions
+39
-3
Lib/asyncio/base_events.py
Lib/asyncio/base_events.py
+19
-3
Lib/test/test_asyncio/test_base_events.py
Lib/test/test_asyncio/test_base_events.py
+20
-0
No files found.
Lib/asyncio/base_events.py
View file @
1f56e5f6
...
...
@@ -102,10 +102,26 @@ def _ipaddr_info(host, port, family, type, proto):
else
:
return
None
if
port
i
n
{
None
,
''
,
b''
}
:
if
port
i
s
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
:
...
...
Lib/test/test_asyncio/test_base_events.py
View file @
1f56e5f6
...
...
@@ -146,6 +146,26 @@ class BaseEventTests(test_utils.TestCase):
(
INET
,
STREAM
,
TCP
,
''
,
(
'1.2.3.4'
,
1
)),
base_events
.
_ipaddr_info
(
'1.2.3.4'
,
b'1'
,
INET
,
STREAM
,
TCP
))
def
test_getaddrinfo_servname
(
self
):
INET
=
socket
.
AF_INET
STREAM
=
socket
.
SOCK_STREAM
TCP
=
socket
.
IPPROTO_TCP
self
.
assertEqual
(
(
INET
,
STREAM
,
TCP
,
''
,
(
'1.2.3.4'
,
80
)),
base_events
.
_ipaddr_info
(
'1.2.3.4'
,
'http'
,
INET
,
STREAM
,
TCP
))
self
.
assertEqual
(
(
INET
,
STREAM
,
TCP
,
''
,
(
'1.2.3.4'
,
80
)),
base_events
.
_ipaddr_info
(
'1.2.3.4'
,
b'http'
,
INET
,
STREAM
,
TCP
))
# Raises "service/proto not found".
with
self
.
assertRaises
(
OSError
):
base_events
.
_ipaddr_info
(
'1.2.3.4'
,
'nonsense'
,
INET
,
STREAM
,
TCP
)
with
self
.
assertRaises
(
OSError
):
base_events
.
_ipaddr_info
(
'1.2.3.4'
,
'nonsense'
,
INET
,
STREAM
,
TCP
)
@
patch_socket
def
test_ipaddr_info_no_inet_pton
(
self
,
m_socket
):
del
m_socket
.
inet_pton
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment