Skip to content

bpo-29890: Fix IPv*Interface constructor when dealing with tuple #816

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
wants to merge 1 commit into from
Closed

bpo-29890: Fix IPv*Interface constructor when dealing with tuple #816

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 @@ -1371,12 +1371,12 @@ def __init__(self, address):
if isinstance(address, tuple):
IPv4Address.__init__(self, address[0])
if len(address) > 1:
self._prefixlen = int(address[1])
arg = address[1]
else:
self._prefixlen = self._max_prefixlen
arg = self._max_prefixlen

self.network = IPv4Network(address, strict=False)
self.netmask = self.network.netmask
self.netmask, self._prefixlen = self._make_netmask(arg)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it necessary to calculating again using self._make_netmask? Is self.netmask, self._prefixlen = self.network.netmask, self.network.prefixlen not enough?

self.hostmask = self.network.hostmask
return

Expand Down Expand Up @@ -2064,11 +2064,11 @@ def __init__(self, address):
if isinstance(address, tuple):
IPv6Address.__init__(self, address[0])
if len(address) > 1:
self._prefixlen = int(address[1])
arg = address[1]
else:
self._prefixlen = self._max_prefixlen
arg = self._max_prefixlen
self.network = IPv6Network(address, strict=False)
self.netmask = self.network.netmask
self.netmask, self._prefixlen = self._make_netmask(arg)
self.hostmask = self.network.hostmask
return

Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,10 @@ def assertBadAddress(addr, details):
assertBadAddress("1.2.3.256", re.escape("256 (> 255)"))

def test_valid_netmask(self):
self.assertEqual(str(self.factory(('192.0.2.0', 24))), '192.0.2.0/24')
self.assertEqual(str(self.factory(('192.0.2.0', '24'))), '192.0.2.0/24')
self.assertEqual(str(self.factory(('192.0.2.0', '255.255.255.0'))),
'192.0.2.0/24')
self.assertEqual(str(self.factory('192.0.2.0/255.255.255.0')),
'192.0.2.0/24')
for i in range(0, 33):
Expand Down Expand Up @@ -501,6 +505,10 @@ def assertBadAddress(addr, details):
def test_valid_netmask(self):
# We only support CIDR for IPv6, because expanded netmasks are not
# standard notation.
self.assertEqual(str(self.factory(('dead:beaf::', 32))),
'dead:beaf::/32')
self.assertEqual(str(self.factory(('dead:beaf::', '32'))),
'dead:beaf::/32')
self.assertEqual(str(self.factory('2001:db8::/32')), '2001:db8::/32')
for i in range(0, 129):
# Generate and re-parse the CIDR format (trivial).
Expand Down