[Python-checkins] cpython: #14814: Use correct comparison for IP addresses
hynek.schlawack
python-checkins at python.org
Mon Jun 4 14:20:17 CEST 2012
http://hg.python.org/cpython/rev/6808a72fc9ec
changeset: 77338:6808a72fc9ec
user: Hynek Schlawack <hs at ox.cx>
date: Mon Jun 04 14:19:39 2012 +0200
summary:
#14814: Use correct comparison for IP addresses
ipaddress._BaseV4.is_unspecified() compared IP addresses using "in" which
fails.
files:
Lib/ipaddress.py | 2 +-
Lib/test/test_ipaddress.py | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1130,7 +1130,7 @@
"""
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
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -837,6 +837,7 @@
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)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list