mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue 14814: Correctly return NotImplemented from ipaddress._BaseNetwork.__eq__

Browse source
This commit is contained in:
Nick Coghlan 2012-07-07 23:05:59 +10:00
parent d46f7d209b
commit 9a9c28ce7a
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_ipaddress.py
View file

@ -462,7 +462,6 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertEqual(128, ipaddress._count_righthand_zero_bits(0, 128))
self.assertEqual("IPv4Network('1.2.3.0/24')", repr(self.ipv4_network))
self.assertEqual('0x1020318', hex(self.ipv4_network))
self.assertRaises(TypeError, self.ipv4_network.__eq__, object())
def testMissingAddressVersion(self):
class Broken(ipaddress._BaseAddress):
@ -496,6 +495,22 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertEqual(str(self.ipv6_network.hostmask),
'::ffff:ffff:ffff:ffff')
def testEqualityChecks(self):
# __eq__ should never raise TypeError directly
other = object()
def assertEqualityNotImplemented(instance):
self.assertEqual(instance.__eq__(other), NotImplemented)
self.assertEqual(instance.__ne__(other), NotImplemented)
self.assertFalse(instance == other)
self.assertTrue(instance != other)
assertEqualityNotImplemented(self.ipv4_address)
assertEqualityNotImplemented(self.ipv4_network)
assertEqualityNotImplemented(self.ipv4_interface)
assertEqualityNotImplemented(self.ipv6_address)
assertEqualityNotImplemented(self.ipv6_network)
assertEqualityNotImplemented(self.ipv6_interface)
def testBadVersionComparison(self):
# These should always raise TypeError
v4addr = ipaddress.ip_address('1.1.1.1')