mirror of https://github.com/python/cpython
Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__
Patch by Gareth Rees.
This commit is contained in:
parent
24b102e6e8
commit
28dc1186a8
|
@ -636,12 +636,12 @@ class _BaseNetwork(_IPAddressBase):
|
|||
broadcast = int(self.broadcast_address)
|
||||
if n >= 0:
|
||||
if network + n > broadcast:
|
||||
raise IndexError
|
||||
raise IndexError('address out of range')
|
||||
return self._address_class(network + n)
|
||||
else:
|
||||
n += 1
|
||||
if broadcast + n < network:
|
||||
raise IndexError
|
||||
raise IndexError('address out of range')
|
||||
return self._address_class(broadcast + n)
|
||||
|
||||
def __lt__(self, other):
|
||||
|
|
|
@ -1176,6 +1176,7 @@ class IpaddrUnitTest(unittest.TestCase):
|
|||
|
||||
self.assertEqual(str(self.ipv6_network[5]),
|
||||
'2001:658:22a:cafe::5')
|
||||
self.assertRaises(IndexError, self.ipv6_network.__getitem__, 1 << 64)
|
||||
|
||||
def testGetitem(self):
|
||||
# http://code.google.com/p/ipaddr-py/issues/detail?id=15
|
||||
|
|
|
@ -38,6 +38,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__.
|
||||
Patch by Gareth Rees.
|
||||
|
||||
- Issue #21386: Implement missing IPv4Address.is_global property. It was
|
||||
documented since 07a5610bae9d. Initial patch by Roger Luethi.
|
||||
|
||||
|
|
Loading…
Reference in New Issue