commit d204a715f4776fc2e5498e81c9e7a647e902b682
author Thomas Wouters <thomas@python.org> Tue Aug 22 13:41:17 2006 +0000
committer Thomas Wouters <thomas@python.org> Tue Aug 22 13:41:17 2006 +0000
tree fd0fdb62b9df60800d49ccf610d907870c789fa1
parent 89da5d7c3d9cf5bfd4a374e23fd924bbffdeaf5c

Make bytesobject raise ValueError instead of TypeError again (thanks, Nick)

Objects/bytesobject.c

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 241281e..d6cce6d 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -245,7 +245,7 @@
     if (PyBytes_Check(value))
         return bytes_substring(self, (PyBytesObject *)value);
 
-    ival = PyNumber_AsSsize_t(value, PyExc_TypeError);
+    ival = PyNumber_AsSsize_t(value, PyExc_ValueError);
     if (ival == -1 && PyErr_Occurred())
         return -1;
     if (ival < 0 || ival >= 256) {
@@ -365,7 +365,7 @@
     if (value == NULL)
         return bytes_setslice(self, i, i+1, NULL);
 
-    ival = PyNumber_AsSsize_t(value, PyExc_TypeError);
+    ival = PyNumber_AsSsize_t(value, PyExc_ValueError);
     if (ival == -1 && PyErr_Occurred())
         return -1;
 
@@ -448,7 +448,7 @@
     }
 
     /* Is it an int? */
-    count = PyNumber_AsSsize_t(arg, PyExc_TypeError);
+    count = PyNumber_AsSsize_t(arg, PyExc_ValueError);
     if (count == -1 && PyErr_Occurred())
         PyErr_Clear();
     else {
@@ -500,7 +500,7 @@
         }
 
         /* Interpret it as an int (__index__) */
-        value = PyNumber_AsSsize_t(item, PyExc_TypeError);
+        value = PyNumber_AsSsize_t(item, PyExc_ValueError);
         Py_DECREF(item);
         if (value == -1 && PyErr_Occurred())
             goto error;