From: Hynek Schlawack Date: Mon, 4 Jun 2012 12:19:39 +0000 (+0200) Subject: #14814: Use correct comparison for IP addresses X-Git-Tag: v3.3.0b1~290^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcd304480f16f3f936a7bdbff4dfab41f8e30292;p=thirdparty%2FPython%2Fcpython.git #14814: Use correct comparison for IP addresses ipaddress._BaseV4.is_unspecified() compared IP addresses using "in" which fails. --- diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index a8edcd1af053..25bcccdc8b55 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -1130,7 +1130,7 @@ class _BaseV4: """ unspecified_address = IPv4Address('0.0.0.0') if isinstance(self, _BaseAddress): - return self in unspecified_address + return self == unspecified_address return (self.network_address == self.broadcast_address == unspecified_address) diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index aff4ff9a7c76..5b7d01344269 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -837,6 +837,7 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(False, ipaddress.ip_network('128.0.0.0').is_loopback) # test addresses + self.assertEqual(True, ipaddress.ip_address('0.0.0.0').is_unspecified) self.assertEqual(True, ipaddress.ip_address('224.1.1.1').is_multicast) self.assertEqual(False, ipaddress.ip_address('240.0.0.0').is_multicast)