From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 11 Jun 2016 19:30:05 +0000 (+0300)
Subject: Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__
X-Git-Tag: v3.6.0a2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28dc1186a895ee76cbe039d71110b8a31fa1add4;p=thirdparty%2FPython%2Fcpython.git

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 1f900583826a..20f33cbdeb67 100644
--- 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 be62fadf0d91..6c08f805da51 100644
--- 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 8c85c21b185d..acf1a2e760fd 100644
--- 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.