mirror of https://github.com/python/cpython
Issue #14814: Clean out an obsolete property and method from ipaddress Network objects
This commit is contained in:
parent
aff73f91cc
commit
2c58910d3d
|
@ -709,12 +709,6 @@ class _BaseNetwork(_IPAddressBase):
|
||||||
self._cache['hostmask'] = x
|
self._cache['hostmask'] = x
|
||||||
return x
|
return x
|
||||||
|
|
||||||
@property
|
|
||||||
def network(self):
|
|
||||||
# XXX (ncoghlan): This is redundant now and will likely be removed
|
|
||||||
return self.__class__('%s/%d' % (str(self.network_address),
|
|
||||||
self.prefixlen))
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def with_prefixlen(self):
|
def with_prefixlen(self):
|
||||||
return '%s/%d' % (str(self.ip), self._prefixlen)
|
return '%s/%d' % (str(self.ip), self._prefixlen)
|
||||||
|
@ -942,12 +936,6 @@ class _BaseNetwork(_IPAddressBase):
|
||||||
|
|
||||||
yield current
|
yield current
|
||||||
|
|
||||||
def masked(self):
|
|
||||||
"""Return the network object with the host bits masked out."""
|
|
||||||
# XXX (ncoghlan): This is redundant now and will likely be removed
|
|
||||||
return self.__class__('%s/%d' % (self.network_address,
|
|
||||||
self._prefixlen))
|
|
||||||
|
|
||||||
def supernet(self, prefixlen_diff=1, new_prefix=None):
|
def supernet(self, prefixlen_diff=1, new_prefix=None):
|
||||||
"""The supernet containing the current network.
|
"""The supernet containing the current network.
|
||||||
|
|
||||||
|
@ -1908,7 +1896,7 @@ class _BaseV6(object):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if isinstance(self, IPv6Network):
|
if isinstance(self, IPv6Network):
|
||||||
return int(self.network) == 1 and getattr(
|
return int(self) == 1 and getattr(
|
||||||
self, '_prefixlen', 128) == 128
|
self, '_prefixlen', 128) == 128
|
||||||
elif isinstance(self, IPv6Interface):
|
elif isinstance(self, IPv6Interface):
|
||||||
return int(self.network.network_address) == 1 and getattr(
|
return int(self.network.network_address) == 1 and getattr(
|
||||||
|
|
|
@ -390,7 +390,7 @@ class IpaddrUnitTest(unittest.TestCase):
|
||||||
self.assertRaises(ValueError, list,
|
self.assertRaises(ValueError, list,
|
||||||
self.ipv4_interface.network.subnets(-1))
|
self.ipv4_interface.network.subnets(-1))
|
||||||
self.assertRaises(ValueError, list,
|
self.assertRaises(ValueError, list,
|
||||||
self.ipv4_network.network.subnets(-1))
|
self.ipv4_network.subnets(-1))
|
||||||
self.assertRaises(ValueError, list,
|
self.assertRaises(ValueError, list,
|
||||||
self.ipv6_interface.network.subnets(-1))
|
self.ipv6_interface.network.subnets(-1))
|
||||||
self.assertRaises(ValueError, list,
|
self.assertRaises(ValueError, list,
|
||||||
|
|
Loading…
Reference in New Issue