change compare_networks to ignore netmask

s-sanjay · Mar 27, 2017 · 942073c · 942073c
1 parent 1e73dbb
commit 942073c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
@@ -852,11 +852,6 @@ def compare_networks(self, other):
             return -1
         if self.network_address > other.network_address:
             return 1
-        # self.network_address == other.network_address below here:
-        if self.netmask < other.netmask:
-            return -1
-        if self.netmask > other.netmask:
-            return 1
         return 0
 
     def _get_networks_key(self):

diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
@@ -1425,9 +1425,8 @@ def testNetworkComparison(self):
 
         self.assertEqual(ip1.compare_networks(ip1), 0)
 
-        # if addresses are the same, sort by netmask
-        self.assertEqual(ip1.compare_networks(ip2), -1)
-        self.assertEqual(ip2.compare_networks(ip1), 1)
+        self.assertEqual(ip1.compare_networks(ip2), 0)
+        self.assertEqual(ip2.compare_networks(ip1), 0)
 
         self.assertEqual(ip1.compare_networks(ip3), -1)
         self.assertEqual(ip3.compare_networks(ip1), 1)