Apr 3, 2024 · Apr 2, 2024 · Apr 2, 2024 · Apr 2, 2024 · Apr 2, 2024 · Apr 2, 2024
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
                                x, None, None, None)
        self.assertRaisesRegex(TypeError, r'^index\b', s.index,
                                x, None, None, None)
        self.assertRaisesRegex(TypeError, r'^rindex\(', s.rindex,
        self.assertRaisesRegex(TypeError, r'^rindex\b', s.rindex,
                                x, None, None, None)
        self.assertRaisesRegex(TypeError, r'^count\b', s.count,
                                x, None, None, None)
diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
    Py_XDECREF(right);
 }

 /*
 Wraps asciilib_parse_args_finds() and additionally ensures that the
 first argument is a unicode object.
 */

 static inline int
 parse_args_finds_unicode(const char * function_name, PyObject *args,
                         PyObject **substring,
                         Py_ssize_t *start, Py_ssize_t *end)
 {
    if (asciilib_parse_args_finds(function_name, args, substring, start, end)) {
        if (ensure_unicode(*substring) < 0)
            return 0;
        return 1;
    }
    return 0;
 }

 /*[clinic input]
 @text_signature "($self, sub[, start[, end]], /)"
 str.count as unicode_count -> Py_ssize_t
    return any_find_slice(str, substr, start, end, -1);
 }

 PyDoc_STRVAR(rindex__doc__,
             "S.rindex(sub[, start[, end]]) -> int\n\
 \n\
 Return the highest index in S where substring sub is found,\n\
 such that sub is contained within S[start:end].  Optional\n\
 arguments start and end are interpreted as in slice notation.\n\
 \n\
 Raises ValueError when the substring is not found.");

 static PyObject *
 unicode_rindex(PyObject *self, PyObject *args)
 {
    /* initialize variables to prevent gcc warning */
    PyObject *substring = NULL;
    Py_ssize_t start = 0;
    Py_ssize_t end = 0;
    Py_ssize_t result;

    if (!parse_args_finds_unicode("rindex", args, &substring, &start, &end))
        return NULL;
 /*[clinic input]
 str.rindex as unicode_rindex = str.count

    result = any_find_slice(self, substring, start, end, -1);
 Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].

    if (result == -2)
        return NULL;
 Optional arguments start and end are interpreted as in slice notation.
 Raises ValueError when the substring is not found.
 [clinic start generated code]*/

    if (result < 0) {
 static Py_ssize_t
 unicode_rindex_impl(PyObject *str, PyObject *substr, Py_ssize_t start,
                    Py_ssize_t end)
 /*[clinic end generated code: output=5f3aef124c867fe1 input=35943dead6c1ea9d]*/
 {
    Py_ssize_t result = any_find_slice(str, substr, start, end, -1);
    if (result == -1) {
        PyErr_SetString(PyExc_ValueError, "substring not found");
        return NULL;
    }

    return PyLong_FromSsize_t(result);
    return result;
 }

 /*[clinic input]
    UNICODE_LOWER_METHODDEF
    UNICODE_LSTRIP_METHODDEF
    UNICODE_RFIND_METHODDEF
 {"rindex", (PyCFunction) unicode_rindex, METH_VARARGS, rindex__doc__},
 UNICODE_RINDEX_METHODDEF
    UNICODE_RJUST_METHODDEF
    UNICODE_RSTRIP_METHODDEF
    UNICODE_RPARTITION_METHODDEF
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1509,7 +1509,7 @@ def test_find_etc_raise_correct_error_messages(self):
		x, None, None, None)
		self.assertRaisesRegex(TypeError, r'^index\b', s.index,
		x, None, None, None)
		self.assertRaisesRegex(TypeError, r'^rindex\(', s.rindex,
		self.assertRaisesRegex(TypeError, r'^rindex\b', s.rindex,
		x, None, None, None)
		self.assertRaisesRegex(TypeError, r'^count\b', s.count,
		x, None, None, None)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11062,24 +11062,6 @@ PyUnicode_AppendAndDel(PyObject *pleft, PyObject right)
		Py_XDECREF(right);
		}

		/*
		Wraps asciilib_parse_args_finds() and additionally ensures that the
		first argument is a unicode object.
		*/

		static inline int
		parse_args_finds_unicode(const char * function_name, PyObject *args,
		PyObject **substring,
		Py_ssize_t start, Py_ssize_t end)
		{
		if (asciilib_parse_args_finds(function_name, args, substring, start, end)) {
		if (ensure_unicode(*substring) < 0)
		return 0;
		return 1;
		}
		return 0;
		}

		/*[clinic input]
		@text_signature "($self, sub[, start[, end]], /)"
		str.count as unicode_count -> Py_ssize_t
Expand DownExpand Up		@@ -12438,38 +12420,25 @@ unicode_rfind_impl(PyObject str, PyObject substr, Py_ssize_t start,
		return any_find_slice(str, substr, start, end, -1);
		}

		PyDoc_STRVAR(rindex__doc__,
		"S.rindex(sub[, start[, end]]) -> int\n\
		\n\
		Return the highest index in S where substring sub is found,\n\
		such that sub is contained within S[start:end]. Optional\n\
		arguments start and end are interpreted as in slice notation.\n\
		\n\
		Raises ValueError when the substring is not found.");

		static PyObject *
		unicode_rindex(PyObject self, PyObject args)
		{
		/* initialize variables to prevent gcc warning */
		PyObject *substring = NULL;
		Py_ssize_t start = 0;
		Py_ssize_t end = 0;
		Py_ssize_t result;

		if (!parse_args_finds_unicode("rindex", args, &substring, &start, &end))
		return NULL;
		/*[clinic input]
		str.rindex as unicode_rindex = str.count

		result = any_find_slice(self, substring, start, end, -1);
		Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].

		if (result == -2)
		return NULL;
		Optional arguments start and end are interpreted as in slice notation.
		Raises ValueError when the substring is not found.
		[clinic start generated code]*/

		if (result < 0) {
		static Py_ssize_t
		unicode_rindex_impl(PyObject str, PyObject substr, Py_ssize_t start,
		Py_ssize_t end)
		/[clinic end generated code: output=5f3aef124c867fe1 input=35943dead6c1ea9d]/
		{
		Py_ssize_t result = any_find_slice(str, substr, start, end, -1);
		if (result == -1) {
		PyErr_SetString(PyExc_ValueError, "substring not found");
		return NULL;
		}

		return PyLong_FromSsize_t(result);
		return result;
		}

		/*[clinic input]
Expand DownExpand Up		@@ -13509,7 +13478,7 @@ static PyMethodDef unicode_methods[] = {
		UNICODE_LOWER_METHODDEF
		UNICODE_LSTRIP_METHODDEF
		UNICODE_RFIND_METHODDEF
		{"rindex", (PyCFunction) unicode_rindex, METH_VARARGS, rindex__doc__},
		UNICODE_RINDEX_METHODDEF
		UNICODE_RJUST_METHODDEF
		UNICODE_RSTRIP_METHODDEF
		UNICODE_RPARTITION_METHODDEF
Expand Down