summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-06-04 14:19:39 +0200
committerHynek Schlawack <hs@ox.cx>2012-06-04 14:19:39 +0200
commit853508548b1b2322e6bdc269a47a22630fbc0c16 (patch)
tree4ad687215223e0beae8212c3d41e40a23430e16f
parent59f3dc5e4265b12e31147ab78145e9ece83a3539 (diff)
downloadcpython-853508548b1b2322e6bdc269a47a22630fbc0c16.tar.gz
#14814: Use correct comparison for IP addresses
ipaddress._BaseV4.is_unspecified() compared IP addresses using "in" which fails.
-rw-r--r--Lib/ipaddress.py2
-rw-r--r--Lib/test/test_ipaddress.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index a8edcd1af0..25bcccdc8b 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 aff4ff9a7c..5b7d013442 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)