diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-04-20 15:59:29 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-04-20 15:59:29 (GMT) |
| commit | c1ceb64e41082282f2e3d28065f5ae1e03fa78ae (patch) | |
| tree | 10833669b6f7cddc7d9dae47b72e29bf69e76748 /Objects/bytearrayobject.c | |
| parent | 5e66b167ff5c6c48385777a6b9b9931bfc2bc2cf (diff) | |
| parent | 6159ee3cf59b3fd8fcf9818c0a8071362d1ad7c2 (diff) | |
| download | cpython-c1ceb64e41082282f2e3d28065f5ae1e03fa78ae.zip cpython-c1ceb64e41082282f2e3d28065f5ae1e03fa78ae.tar.gz cpython-c1ceb64e41082282f2e3d28065f5ae1e03fa78ae.tar.bz2 | |
MERGE: startswith and endswith don't accept None as slice index. Patch by Torsten Becker. (closes #11828)
Diffstat (limited to 'Objects/bytearrayobject.c')
| -rw-r--r-- | Objects/bytearrayobject.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index e98c658..970a6b5 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -1081,8 +1081,8 @@ bytearray_find_internal(PyByteArrayObject *self, PyObject *args, int dir) Py_ssize_t start=0, end=PY_SSIZE_T_MAX; Py_ssize_t res; - if (!PyArg_ParseTuple(args, "O|O&O&:find/rfind/index/rindex", &subobj, - _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) + if (!stringlib_parse_args_finds("find/rfind/index/rindex", + args, &subobj, &start, &end)) return -2; if (_getbuffer(subobj, &subbuf) < 0) return -2; @@ -1132,8 +1132,7 @@ bytearray_count(PyByteArrayObject *self, PyObject *args) Py_buffer vsub; PyObject *count_obj; - if (!PyArg_ParseTuple(args, "O|O&O&:count", &sub_obj, - _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) + if (!stringlib_parse_args_finds("count", args, &sub_obj, &start, &end)) return NULL; if (_getbuffer(sub_obj, &vsub) < 0) @@ -1315,8 +1314,7 @@ bytearray_startswith(PyByteArrayObject *self, PyObject *args) PyObject *subobj; int result; - if (!PyArg_ParseTuple(args, "O|O&O&:startswith", &subobj, - _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) + if (!stringlib_parse_args_finds("startswith", args, &subobj, &start, &end)) return NULL; if (PyTuple_Check(subobj)) { Py_ssize_t i; @@ -1355,8 +1353,7 @@ bytearray_endswith(PyByteArrayObject *self, PyObject *args) PyObject *subobj; int result; - if (!PyArg_ParseTuple(args, "O|O&O&:endswith", &subobj, - _PyEval_SliceIndex, &start, _PyEval_SliceIndex, &end)) + if (!stringlib_parse_args_finds("endswith", args, &subobj, &start, &end)) return NULL; if (PyTuple_Check(subobj)) { Py_ssize_t i; |