#6780: fix starts/endswith error message to mention that tuples are accepted too.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 616f390..f2ee131 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2654,8 +2654,12 @@
Py_RETURN_FALSE;
}
result = _bytes_tailmatch(self, subobj, start, end, -1);
- if (result == -1)
+ if (result == -1) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError))
+ PyErr_Format(PyExc_TypeError, "startswith first arg must be bytes "
+ "or a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name);
return NULL;
+ }
else
return PyBool_FromLong(result);
}
@@ -2694,8 +2698,12 @@
Py_RETURN_FALSE;
}
result = _bytes_tailmatch(self, subobj, start, end, +1);
- if (result == -1)
+ if (result == -1) {
+ if (PyErr_ExceptionMatches(PyExc_TypeError))
+ PyErr_Format(PyExc_TypeError, "endswith first arg must be bytes or "
+ "a tuple of bytes, not %s", Py_TYPE(subobj)->tp_name);
return NULL;
+ }
else
return PyBool_FromLong(result);
}