From f077922a02dc701b0640b2740227d1b9036e116c Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 27 Aug 2022 16:35:08 +0300 Subject: [PATCH 1/4] Add `tuple` argument to `ip_network` --- stdlib/ipaddress.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/ipaddress.pyi b/stdlib/ipaddress.pyi index d324f52ac25a..ee1ee8f2b39f 100644 --- a/stdlib/ipaddress.pyi +++ b/stdlib/ipaddress.pyi @@ -15,7 +15,7 @@ _RawIPAddress: TypeAlias = int | str | bytes | IPv4Address | IPv6Address _RawNetworkPart: TypeAlias = IPv4Network | IPv6Network | IPv4Interface | IPv6Interface def ip_address(address: _RawIPAddress) -> IPv4Address | IPv6Address: ... -def ip_network(address: _RawIPAddress | _RawNetworkPart, strict: bool = ...) -> IPv4Network | IPv6Network: ... +def ip_network(address: _RawIPAddress | _RawNetworkPart | Tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... def ip_interface(address: _RawIPAddress | _RawNetworkPart) -> IPv4Interface | IPv6Interface: ... class _IPAddressBase: From 29170564435181958976086b056bb403b3be888a Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 27 Aug 2022 16:44:09 +0300 Subject: [PATCH 2/4] Also single-element tuples are allowed --- stdlib/ipaddress.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/ipaddress.pyi b/stdlib/ipaddress.pyi index ee1ee8f2b39f..eb671816237a 100644 --- a/stdlib/ipaddress.pyi +++ b/stdlib/ipaddress.pyi @@ -15,7 +15,7 @@ _RawIPAddress: TypeAlias = int | str | bytes | IPv4Address | IPv6Address _RawNetworkPart: TypeAlias = IPv4Network | IPv6Network | IPv4Interface | IPv6Interface def ip_address(address: _RawIPAddress) -> IPv4Address | IPv6Address: ... -def ip_network(address: _RawIPAddress | _RawNetworkPart | Tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... +def ip_network(address: _RawIPAddress | _RawNetworkPart | Tuple[_RawIPAddress], Tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... def ip_interface(address: _RawIPAddress | _RawNetworkPart) -> IPv4Interface | IPv6Interface: ... class _IPAddressBase: From 33437896202234b9ae45e364f49f571108ab5c99 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Sat, 27 Aug 2022 14:54:08 +0100 Subject: [PATCH 3/4] Fix syntax --- stdlib/ipaddress.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/ipaddress.pyi b/stdlib/ipaddress.pyi index eb671816237a..1704241bcab9 100644 --- a/stdlib/ipaddress.pyi +++ b/stdlib/ipaddress.pyi @@ -15,7 +15,7 @@ _RawIPAddress: TypeAlias = int | str | bytes | IPv4Address | IPv6Address _RawNetworkPart: TypeAlias = IPv4Network | IPv6Network | IPv4Interface | IPv6Interface def ip_address(address: _RawIPAddress) -> IPv4Address | IPv6Address: ... -def ip_network(address: _RawIPAddress | _RawNetworkPart | Tuple[_RawIPAddress], Tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... +def ip_network(address: _RawIPAddress | _RawNetworkPart | tuple[_RawIPAddress] | tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... def ip_interface(address: _RawIPAddress | _RawNetworkPart) -> IPv4Interface | IPv6Interface: ... class _IPAddressBase: From 1061802d87e795df4bd638681d8aeab518957fb6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 27 Aug 2022 13:55:14 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/ipaddress.pyi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stdlib/ipaddress.pyi b/stdlib/ipaddress.pyi index 1704241bcab9..2c0292d6fbae 100644 --- a/stdlib/ipaddress.pyi +++ b/stdlib/ipaddress.pyi @@ -15,7 +15,9 @@ _RawIPAddress: TypeAlias = int | str | bytes | IPv4Address | IPv6Address _RawNetworkPart: TypeAlias = IPv4Network | IPv6Network | IPv4Interface | IPv6Interface def ip_address(address: _RawIPAddress) -> IPv4Address | IPv6Address: ... -def ip_network(address: _RawIPAddress | _RawNetworkPart | tuple[_RawIPAddress] | tuple[_RawIPAddress, int], strict: bool = ...) -> IPv4Network | IPv6Network: ... +def ip_network( + address: _RawIPAddress | _RawNetworkPart | tuple[_RawIPAddress] | tuple[_RawIPAddress, int], strict: bool = ... +) -> IPv4Network | IPv6Network: ... def ip_interface(address: _RawIPAddress | _RawNetworkPart) -> IPv4Interface | IPv6Interface: ... class _IPAddressBase: