From 942073c1ebd29891e047b5e784750c2b6f74494a Mon Sep 17 00:00:00 2001 From: sanjay Date: Sun, 26 Mar 2017 23:52:28 -0700 Subject: [PATCH] change compare_networks to ignore netmask --- Lib/ipaddress.py | 5 ----- Lib/test/test_ipaddress.py | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index 20f33cbdeb67d0..8b84cab1d19fe5 100644 --- 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 index 0e39516dc033e3..8f0907851c7ddb 100644 --- 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)