From ce1f9ca51bd91ed66233c1bac7eb05fac9c855c7 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Thu, 30 Jun 2016 13:57:52 +0200 Subject: Remove unused is_local(), interface, and defaultnet from CheckedIPAddress All these were unused so I'm removing them to keep the code clean and easier to read. At this point it is clear that only difference between netaddr.IPAddress and CheckedIPAddress is prefixlen attribute. Reviewed-By: Martin Basti --- ipapython/ipautil.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'ipapython') diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index c7e20c510..8506bf2d5 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -87,13 +87,10 @@ class CheckedIPAddress(netaddr.IPAddress): if isinstance(addr, CheckedIPAddress): super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags) self.prefixlen = addr.prefixlen - self.defaultnet = addr.defaultnet - self.interface = addr.interface return net = None iface = None - defnet = False if isinstance(addr, netaddr.IPNetwork): net = addr @@ -161,7 +158,6 @@ class CheckedIPAddress(netaddr.IPAddress): raise ValueError('No network interface matches the provided IP address and netmask') if net is None: - defnet = True if addr.version == 4: net = netaddr.IPNetwork(netaddr.cidr_abbrev_to_verbose(str(addr))) elif addr.version == 6: @@ -174,11 +170,6 @@ class CheckedIPAddress(netaddr.IPAddress): super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags) self.prefixlen = net.prefixlen - self.defaultnet = defnet - self.interface = iface - - def is_local(self): - return self.interface is not None def valid_ip(addr): return netaddr.valid_ipv4(addr) or netaddr.valid_ipv6(addr) -- cgit