Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__

Patch by Gareth Rees.

diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 1f900583826a80088ba9f72686b0cbdfac574208..20f33cbdeb67d00ffff4726c01ccb04529489716 100644 (file)
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -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):

diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index be62fadf0d9140c7bebed745fe7e5f4635a720cd..6c08f805da51bd4415d8589663ea3e5cf1a509dc 100644 (file)
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -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

diff --git a/Misc/NEWS b/Misc/NEWS
index 8c85c21b185d5a1839f61cd945302fc023a2993d..acf1a2e760fdd7a1ff75e5bc273a088edee40ea5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.