changeset:   101881:bc758c62bc4f
user:        Berker Peksag <berker.peksag@gmail.com>
date:        Sat Jun 11 22:30:05 2016 +0300
files:       Lib/ipaddress.py Lib/test/test_ipaddress.py Misc/NEWS
description:
Issue #20508: Improve exception message of IPv{4,6}Network.__getitem__

Patch by Gareth Rees.


diff -r 1519ca772e54 -r bc758c62bc4f Lib/ipaddress.py
--- a/Lib/ipaddress.py	Sat Jun 11 22:12:36 2016 +0300
+++ b/Lib/ipaddress.py	Sat Jun 11 22:30:05 2016 +0300
@@ -636,12 +636,12 @@
         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 -r 1519ca772e54 -r bc758c62bc4f Lib/test/test_ipaddress.py
--- a/Lib/test/test_ipaddress.py	Sat Jun 11 22:12:36 2016 +0300
+++ b/Lib/test/test_ipaddress.py	Sat Jun 11 22:30:05 2016 +0300
@@ -1176,6 +1176,7 @@
 
         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 -r 1519ca772e54 -r bc758c62bc4f Misc/NEWS
--- a/Misc/NEWS	Sat Jun 11 22:12:36 2016 +0300
+++ b/Misc/NEWS	Sat Jun 11 22:30:05 2016 +0300
@@ -38,6 +38,9 @@
 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.