From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 5 Aug 2012 12:45:22 +0000 (+1000)
Subject: Issue #14814: Remove redundant property from interface objects - prefixlen can be... 
X-Git-Tag: v3.3.0b2~36^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3ded955f3b145e38be47be61c53ba1ff130f47b;p=python

Issue #14814: Remove redundant property from interface objects - prefixlen can be accessed via the associated network object
---

diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index dfb59445ae..c9338c55f3 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1330,10 +1330,6 @@ class IPv4Interface(IPv4Address):
     def __hash__(self):
         return self._ip ^ self._prefixlen ^ int(self.network.network_address)
 
-    @property
-    def prefixlen(self):
-        return self._prefixlen
-
     @property
     def ip(self):
         return IPv4Address(self._ip)
@@ -1708,7 +1704,7 @@ class _BaseV6:
         hex_str = '%032x' % ip_int
         parts = [hex_str[x:x+4] for x in range(0, 32, 4)]
         if isinstance(self, (_BaseNetwork, IPv6Interface)):
-            return '%s/%d' % (':'.join(parts), self.prefixlen)
+            return '%s/%d' % (':'.join(parts), self._prefixlen)
         return ':'.join(parts)
 
     @property
@@ -1946,10 +1942,6 @@ class IPv6Interface(IPv6Address):
     def __hash__(self):
         return self._ip ^ self._prefixlen ^ int(self.network.network_address)
 
-    @property
-    def prefixlen(self):
-        return self._prefixlen
-
     @property
     def ip(self):
         return IPv6Address(self._ip)
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index 061c866073..09b4a5e438 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -731,8 +731,8 @@ class IpaddrUnitTest(unittest.TestCase):
                          '2001:658:22a:cafe:ffff:ffff:ffff:ffff')
 
     def testGetPrefixlen(self):
-        self.assertEqual(self.ipv4_interface.prefixlen, 24)
-        self.assertEqual(self.ipv6_interface.prefixlen, 64)
+        self.assertEqual(self.ipv4_interface.network.prefixlen, 24)
+        self.assertEqual(self.ipv6_interface.network.prefixlen, 64)
 
     def testGetSupernet(self):
         self.assertEqual(self.ipv4_network.supernet().prefixlen, 23)