Skip to content

gh-79200: support IPAddress in asyncio.start_server() #17434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vegerot wants to merge 10 commits into from
Closed

gh-79200: support IPAddress in asyncio.start_server() #17434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11a0058
support new Python3 IPv4Address and IPv6Address
vegerot Dec 2, 2019
3af5c9e
bpo-35019: Add tests for IPAddress in asyncio
vegerot Jun 10, 2020
d84137e
bpo-35019: Add Doc and ACKS
vegerot Jun 10, 2020
a3e6bc2
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 10, 2020
e9d5785
Update Misc/ACKS
vegerot Jun 10, 2020
d086d95
Update Doc/library/asyncio-stream.rst
vegerot Jun 10, 2020
be0755c
Update Doc/library/asyncio-stream.rst
vegerot Jun 10, 2020
ba7c66a
Update Misc/NEWS.d/next/Library/2020-06-10-01-33-27.bpo-35019.dwhOOO.rst
vegerot Jun 10, 2020
87f466f
bpo-35019: Fix whitespace
vegerot Jun 10, 2020
106afad
Document base_events.py
vegerot Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Doc/library/asyncio-stream.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ and work with streams:

The *ssl_handshake_timeout* parameter.

.. versionadded:: 3.10
Added support for IPAddress

.. coroutinefunction:: start_server(client_connected_cb, host=None, \
port=None, \*, loop=None, limit=None, \
family=socket.AF_UNSPEC, \
Expand Down Expand Up @@ -106,6 +109,9 @@ and work with streams:

The *ssl_handshake_timeout* and *start_serving* parameters.

.. versionadded:: 3.10
Added support for IPAddress


.. rubric:: Unix Sockets

Expand Down
3 changes: 3 additions & 0 deletions Lib/asyncio/base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ def _ipaddr_info(host, port, family, type, proto, flowinfo=0, scopeid=0):

if isinstance(host, bytes):
host = host.decode('idna')
# Even though we're calling str() on host (so we'll convert arbitrary objects to str),
# we're restricting it to a valid IP address later when calling socket.inet_pton().
host = str(host)
Comment thread
vegerot marked this conversation as resolved.
if '%' in host:
# Linux's inet_pton doesn't accept an IPv6 zone index after host,
# like '::1%lo0'.
Expand Down
11 changes: 11 additions & 0 deletions Lib/test/test_asyncio/test_base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from test import support
from test.support.script_helper import assert_python_ok
from test.support import socket_helper
from ipaddress import IPv4Address, IPv6Address


MOCK_ANY = mock.ANY
Expand Down Expand Up @@ -77,6 +78,11 @@ def test_ipaddr_info(self):
(INET, DGRAM, UDP, '', ('1.2.3.4', 1)),
base_events._ipaddr_info('1.2.3.4', 1, UNSPEC, DGRAM, UDP))

# IPv4Address
self.assertEqual(
(INET, DGRAM, UDP, '', ('1.2.3.4', 1)),
base_events._ipaddr_info(IPv4Address('1.2.3.4'), 1, UNSPEC, DGRAM, UDP))

# Socket type STREAM implies TCP protocol.
self.assertEqual(
(INET, STREAM, TCP, '', ('1.2.3.4', 1)),
Expand Down Expand Up @@ -104,6 +110,11 @@ def test_ipaddr_info(self):
(INET6, STREAM, TCP, '', ('::3', 1, 0, 0)),
base_events._ipaddr_info('::3', 1, UNSPEC, STREAM, TCP))

# IPv6Address
self.assertEqual(
(INET6, STREAM, TCP, '', ('::3', 1, 0, 0)),
base_events._ipaddr_info(IPv6Address('::3'), 1, UNSPEC, STREAM, TCP))

# IPv6 address with family IPv4.
self.assertIsNone(
base_events._ipaddr_info('::3', 1, INET, STREAM, TCP))
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ David M. Cooke
Jason R. Coombs
Garrett Cooper
Greg Copeland
Max Coplan
Ian Cordasco
Aldo Cortesi
Mircea Cosbuc
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-06-10-01-33-27.bpo-35019.dwhOOO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added support for IPAddress in asyncio.start_server()