SF patch #664192 bug #661913: inconsistent error messages between string

                              and unicode

Patch by Christopher Blunck.

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 1a4a7547deb0313e9f070ab54ccf689b1b0c49c7..f18edb00c46d914dda640278ee60c7b9c8243c21 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1620,7 +1620,7 @@ string_index(PyStringObject *self, PyObject *args)
                return NULL;
        if (result == -1) {
                PyErr_SetString(PyExc_ValueError,
-                               "substring not found in string.index");
+                               "substring not found");
                return NULL;
        }
        return PyInt_FromLong(result);
@@ -1659,7 +1659,7 @@ string_rindex(PyStringObject *self, PyObject *args)
                return NULL;
        if (result == -1) {
                PyErr_SetString(PyExc_ValueError,
-                               "substring not found in string.rindex");
+                               "substring not found");
                return NULL;
        }
        return PyInt_FromLong(result);