diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2017-03-30 15:29:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-30 15:29:23 (GMT) |
commit | d4edfc9abffca965e76ebc5957a92031a4d6c4d4 (patch) | |
tree | d985a5ba3c7dd8ec3183014962d650724f61ece9 /Objects | |
parent | 762ec97ea68a1126b8855996c61fa8239dc9fff7 (diff) | |
download | cpython-d4edfc9abffca965e76ebc5957a92031a4d6c4d4.zip cpython-d4edfc9abffca965e76ebc5957a92031a4d6c4d4.tar.gz cpython-d4edfc9abffca965e76ebc5957a92031a4d6c4d4.tar.bz2 |
bpo-29935: Fixed error messages in the index() method of tuple, list and deque (#887)
when pass indices of wrong type.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/clinic/listobject.c.h | 4 | ||||
-rw-r--r-- | Objects/clinic/tupleobject.c.h | 4 | ||||
-rw-r--r-- | Objects/tupleobject.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Objects/clinic/listobject.c.h b/Objects/clinic/listobject.c.h index eeb932a..43d5599 100644 --- a/Objects/clinic/listobject.c.h +++ b/Objects/clinic/listobject.c.h @@ -196,7 +196,7 @@ list_index(PyListObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwna Py_ssize_t stop = PY_SSIZE_T_MAX; if (!_PyArg_ParseStack(args, nargs, "O|O&O&:index", - &value, _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &stop)) { + &value, _PyEval_SliceIndexNotNone, &start, _PyEval_SliceIndexNotNone, &stop)) { goto exit; } @@ -297,4 +297,4 @@ list___reversed__(PyListObject *self, PyObject *Py_UNUSED(ignored)) { return list___reversed___impl(self); } -/*[clinic end generated code: output=2a3b75efcf858ed5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=71deae70ca0e6799 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/tupleobject.c.h b/Objects/clinic/tupleobject.c.h index 12f0df1..880b258 100644 --- a/Objects/clinic/tupleobject.c.h +++ b/Objects/clinic/tupleobject.c.h @@ -26,7 +26,7 @@ tuple_index(PyTupleObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kw Py_ssize_t stop = PY_SSIZE_T_MAX; if (!_PyArg_ParseStack(args, nargs, "O|O&O&:index", - &value, _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &stop)) { + &value, _PyEval_SliceIndexNotNone, &start, _PyEval_SliceIndexNotNone, &stop)) { goto exit; } @@ -99,4 +99,4 @@ tuple___getnewargs__(PyTupleObject *self, PyObject *Py_UNUSED(ignored)) { return tuple___getnewargs___impl(self); } -/*[clinic end generated code: output=561a3654411d2225 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=145bcfff64e8c809 input=a9049054013a1b77]*/ diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 9c63983..55da0e3 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -534,8 +534,8 @@ tuplerepeat(PyTupleObject *a, Py_ssize_t n) tuple.index value: object - start: object(converter="_PyEval_SliceIndex", type="Py_ssize_t") = 0 - stop: object(converter="_PyEval_SliceIndex", type="Py_ssize_t", c_default="PY_SSIZE_T_MAX") = sys.maxsize + start: slice_index(accept={int}) = 0 + stop: slice_index(accept={int}, c_default="PY_SSIZE_T_MAX") = sys.maxsize / Return first index of value. @@ -546,7 +546,7 @@ Raises ValueError if the value is not present. static PyObject * tuple_index_impl(PyTupleObject *self, PyObject *value, Py_ssize_t start, Py_ssize_t stop) -/*[clinic end generated code: output=07b6f9f3cb5c33eb input=28890d4bec234471]*/ +/*[clinic end generated code: output=07b6f9f3cb5c33eb input=fb39e9874a21fe3f]*/ { Py_ssize_t i; |