Skip to content

gh-156680: Raise the documented error from IPv6Network.next_network() #156681

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

Open
fedonman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

gh-156680: Raise the documented error from IPv6Network.next_network() #156681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Lib/ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,15 +1150,15 @@ def next_network(self, next_prefix=None):
((new_netmask._ip & self.network_address._ip) >> bit_shift) + 1
) << bit_shift

try:
return self.__class__(
f"{self._string_from_ip_int(next_ip)}/{next_prefix}"
)
except OverflowError:
if next_ip > self._ALL_ONES:
raise ValueError(
f"out of address space, cannot make another /{next_prefix} "
"network"
) from None
)

return self.__class__(
f"{self._string_from_ip_int(next_ip)}/{next_prefix}"
)


class _BaseConstants:
Expand Down
10 changes: 8 additions & 2 deletions Lib/test/test_ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,9 +1596,15 @@ def testNextNetworkWithBadPrefix(self):

def testNextNetworkOutOfAddressSpace(self):
ipv4 = ipaddress.IPv4Network('255.255.255.0/24')
self.assertRaises(ValueError, ipv4.next_network)
self.assertRaisesRegex(
ValueError,
'out of address space, cannot make another /24 network',
ipv4.next_network)
ipv6 = ipaddress.IPv6Network('ffff:ffff:ffff:ffff:ffff:ffff:ffff:0/112')
self.assertRaises(ValueError, ipv6.next_network)
self.assertRaisesRegex(
ValueError,
'out of address space, cannot make another /112 network',
ipv6.next_network)

def testFancySubnetting(self):
self.assertEqual(sorted(self.ipv4_network.subnets(prefixlen_diff=3)),
Expand Down
Loading