mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 04:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

#14814: Use correct comparison for IP addresses

Browse source 
ipaddress._BaseV4.is_unspecified() compared IP addresses using "in" which
fails.
This commit is contained in:
Hynek Schlawack 2012-06-04 14:19:39 +02:00
parent 7d74effc67
commit bcd304480f
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/ipaddress.py
View file

@ -1130,7 +1130,7 @@ class _BaseV4:
""" """
unspecified_address = IPv4Address('0.0.0.0') unspecified_address = IPv4Address('0.0.0.0')
if isinstance(self, _BaseAddress): if isinstance(self, _BaseAddress):
return self in unspecified_address return self == unspecified_address
return (self.network_address == self.broadcast_address == return (self.network_address == self.broadcast_address ==
unspecified_address) unspecified_address)

1
Lib/test/test_ipaddress.py
View file

@ -837,6 +837,7 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertEqual(False, ipaddress.ip_network('128.0.0.0').is_loopback) self.assertEqual(False, ipaddress.ip_network('128.0.0.0').is_loopback)
# test addresses # 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(True, ipaddress.ip_address('224.1.1.1').is_multicast)
self.assertEqual(False, ipaddress.ip_address('240.0.0.0').is_multicast) self.assertEqual(False, ipaddress.ip_address('240.0.0.0').is_multicast)