changeset:   91959:02d6d3a7a181
user:        Terry Jan Reedy <tjreedy@udel.edu>
date:        Sat Aug 02 01:30:37 2014 -0400
files:       Lib/test/list_tests.py Lib/test/test_bytes.py Lib/test/test_tuple.py Misc/NEWS Objects/bytearrayobject.c Objects/bytesobject.c Objects/listobject.c Objects/tupleobject.c
description:
Issue #22077: Improve index error messages for bytearrays, bytes, lists, and
tuples by adding 'or slices'. Added ', not <typename' for bytearrays.
Original patch by Claudiu Popa.


diff -r 2c70897e5f98 -r 02d6d3a7a181 Lib/test/list_tests.py
--- a/Lib/test/list_tests.py	Fri Aug 01 21:57:49 2014 +0100
+++ b/Lib/test/list_tests.py	Sat Aug 02 01:30:37 2014 -0400
@@ -30,6 +30,12 @@
         self.assertNotEqual(id(a), id(b))
         self.assertEqual(a, b)
 
+    def test_getitem_error(self):
+        msg = "list indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            a = []
+            a['a'] = "python"
+
     def test_repr(self):
         l0 = []
         l2 = [0, 1, 2]
@@ -120,6 +126,10 @@
         a[-1] = 9
         self.assertEqual(a, self.type2test([5,6,7,8,9]))
 
+        msg = "list indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            a['a'] = "python"
+
     def test_delitem(self):
         a = self.type2test([0, 1])
         del a[1]
diff -r 2c70897e5f98 -r 02d6d3a7a181 Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py	Fri Aug 01 21:57:49 2014 +0100
+++ b/Lib/test/test_bytes.py	Sat Aug 02 01:30:37 2014 -0400
@@ -699,6 +699,11 @@
 class BytesTest(BaseBytesTest, unittest.TestCase):
     type2test = bytes
 
+    def test_getitem_error(self):
+        msg = "byte indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            b'python'['a']
+
     def test_buffer_is_readonly(self):
         fd = os.open(__file__, os.O_RDONLY)
         with open(fd, "rb", buffering=0) as f:
@@ -753,6 +758,17 @@
 class ByteArrayTest(BaseBytesTest, unittest.TestCase):
     type2test = bytearray
 
+    def test_getitem_error(self):
+        msg = "bytearray indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            bytearray(b'python')['a']
+
+    def test_setitem_error(self):
+        msg = "bytearray indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            b = bytearray(b'python')
+            b['a'] = "python"
+
     def test_nohash(self):
         self.assertRaises(TypeError, hash, bytearray())
 
diff -r 2c70897e5f98 -r 02d6d3a7a181 Lib/test/test_tuple.py
--- a/Lib/test/test_tuple.py	Fri Aug 01 21:57:49 2014 +0100
+++ b/Lib/test/test_tuple.py	Sat Aug 02 01:30:37 2014 -0400
@@ -6,6 +6,11 @@
 class TupleTest(seq_tests.CommonTest):
     type2test = tuple
 
+    def test_getitem_error(self):
+        msg = "tuple indices must be integers or slices"
+        with self.assertRaisesRegex(TypeError, msg):
+            ()['a']
+
     def test_constructors(self):
         super().test_constructors()
         # calling built-in types without argument must return empty
diff -r 2c70897e5f98 -r 02d6d3a7a181 Misc/NEWS
--- a/Misc/NEWS	Fri Aug 01 21:57:49 2014 +0100
+++ b/Misc/NEWS	Sat Aug 02 01:30:37 2014 -0400
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #22077: Improve index error messages for bytearrays, bytes, lists,
+  and tuples by adding 'or slices'. Added ', not <typename' for bytearrays.
+  Original patch by Claudiu Popa.
+
 - Issue #18395: Rename ``_Py_char2wchar()`` to :c:func:`Py_DecodeLocale`,
   rename ``_Py_wchar2char()`` to :c:func:`Py_EncodeLocale`, and document
   these functions.
diff -r 2c70897e5f98 -r 02d6d3a7a181 Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c	Fri Aug 01 21:57:49 2014 +0100
+++ b/Objects/bytearrayobject.c	Sat Aug 02 01:30:37 2014 -0400
@@ -445,7 +445,9 @@
         }
     }
     else {
-        PyErr_SetString(PyExc_TypeError, "bytearray indices must be integers");
+        PyErr_Format(PyExc_TypeError,
+                     "bytearray indices must be integers or slices, not %.200s",
+                     Py_TYPE(index)->tp_name);
         return NULL;
     }
 }
@@ -650,7 +652,9 @@
         }
     }
     else {
-        PyErr_SetString(PyExc_TypeError, "bytearray indices must be integer");
+        PyErr_Format(PyExc_TypeError,
+                     "bytearray indices must be integers or slices, not %.200s",
+                      Py_TYPE(index)->tp_name);
         return -1;
     }
 
diff -r 2c70897e5f98 -r 02d6d3a7a181 Objects/bytesobject.c
--- a/Objects/bytesobject.c	Fri Aug 01 21:57:49 2014 +0100
+++ b/Objects/bytesobject.c	Sat Aug 02 01:30:37 2014 -0400
@@ -999,7 +999,7 @@
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "byte indices must be integers, not %.200s",
+                     "byte indices must be integers or slices, not %.200s",
                      Py_TYPE(item)->tp_name);
         return NULL;
     }
diff -r 2c70897e5f98 -r 02d6d3a7a181 Objects/listobject.c
--- a/Objects/listobject.c	Fri Aug 01 21:57:49 2014 +0100
+++ b/Objects/listobject.c	Sat Aug 02 01:30:37 2014 -0400
@@ -2444,7 +2444,7 @@
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "list indices must be integers, not %.200s",
+                     "list indices must be integers or slices, not %.200s",
                      item->ob_type->tp_name);
         return NULL;
     }
@@ -2608,7 +2608,7 @@
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "list indices must be integers, not %.200s",
+                     "list indices must be integers or slices, not %.200s",
                      item->ob_type->tp_name);
         return -1;
     }
diff -r 2c70897e5f98 -r 02d6d3a7a181 Objects/tupleobject.c
--- a/Objects/tupleobject.c	Fri Aug 01 21:57:49 2014 +0100
+++ b/Objects/tupleobject.c	Sat Aug 02 01:30:37 2014 -0400
@@ -746,7 +746,7 @@
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "tuple indices must be integers, not %.200s",
+                     "tuple indices must be integers or slices, not %.200s",
                      Py_TYPE(item)->tp_name);
         return NULL;
     }