summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2016-06-30 13:57:52 +0200
committerMartin Basti <mbasti@redhat.com>2016-07-01 10:35:39 +0200
commitce1f9ca51bd91ed66233c1bac7eb05fac9c855c7 (patch)
treef6bd8e40ff7309e7aab91f06f44cc79ea8a8f5bf
parenta635135ba3caa6359c38f305d7982925ef3de50b (diff)
downloadfreeipa-ce1f9ca51bd91ed66233c1bac7eb05fac9c855c7.tar.gz
freeipa-ce1f9ca51bd91ed66233c1bac7eb05fac9c855c7.tar.xz
freeipa-ce1f9ca51bd91ed66233c1bac7eb05fac9c855c7.zip
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 <mbasti@redhat.com>
-rw-r--r--ipapython/ipautil.py9
1 files changed, 0 insertions, 9 deletions
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)