diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2017-10-28 23:11:54 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-28 23:11:54 (GMT) |
commit | a2314283ff87c65e1745a42c2f2b716b1a209128 (patch) | |
tree | b1b1287aeea750c8694673939ec72b469c19cc59 /Objects/clinic | |
parent | 5a4bbcd479ce86f68bbe12bc8c16e3447f32e13a (diff) | |
download | cpython-a2314283ff87c65e1745a42c2f2b716b1a209128.zip cpython-a2314283ff87c65e1745a42c2f2b716b1a209128.tar.gz cpython-a2314283ff87c65e1745a42c2f2b716b1a209128.tar.bz2 |
bpo-20047: Make bytearray methods partition() and rpartition() rejecting (#4158)
separators that are not bytes-like objects.
Diffstat (limited to 'Objects/clinic')
-rw-r--r-- | Objects/clinic/bytearrayobject.c.h | 17 | ||||
-rw-r--r-- | Objects/clinic/bytesobject.c.h | 4 | ||||
-rw-r--r-- | Objects/clinic/unicodeobject.c.h | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/Objects/clinic/bytearrayobject.c.h b/Objects/clinic/bytearrayobject.c.h index 319c86e..d45592b 100644 --- a/Objects/clinic/bytearrayobject.c.h +++ b/Objects/clinic/bytearrayobject.c.h @@ -214,10 +214,10 @@ PyDoc_STRVAR(bytearray_partition__doc__, "\n" "This will search for the separator sep in the bytearray. If the separator is\n" "found, returns a 3-tuple containing the part before the separator, the\n" -"separator itself, and the part after it.\n" +"separator itself, and the part after it as new bytearray objects.\n" "\n" -"If the separator is not found, returns a 3-tuple containing the original\n" -"bytearray object and two empty bytearray objects."); +"If the separator is not found, returns a 3-tuple containing the copy of the\n" +"original bytearray object and two empty bytearray objects."); #define BYTEARRAY_PARTITION_METHODDEF \ {"partition", (PyCFunction)bytearray_partition, METH_O, bytearray_partition__doc__}, @@ -226,14 +226,15 @@ PyDoc_STRVAR(bytearray_rpartition__doc__, "rpartition($self, sep, /)\n" "--\n" "\n" -"Partition the bytes into three parts using the given separator.\n" +"Partition the bytearray into three parts using the given separator.\n" "\n" -"This will search for the separator sep in the bytearray, starting and the end.\n" +"This will search for the separator sep in the bytearray, starting at the end.\n" "If the separator is found, returns a 3-tuple containing the part before the\n" -"separator, the separator itself, and the part after it.\n" +"separator, the separator itself, and the part after it as new bytearray\n" +"objects.\n" "\n" "If the separator is not found, returns a 3-tuple containing two empty bytearray\n" -"objects and the original bytearray object."); +"objects and the copy of the original bytearray object."); #define BYTEARRAY_RPARTITION_METHODDEF \ {"rpartition", (PyCFunction)bytearray_rpartition, METH_O, bytearray_rpartition__doc__}, @@ -711,4 +712,4 @@ bytearray_sizeof(PyByteArrayObject *self, PyObject *Py_UNUSED(ignored)) { return bytearray_sizeof_impl(self); } -/*[clinic end generated code: output=e53f10084457a46b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=c2804d009182328c input=a9049054013a1b77]*/ diff --git a/Objects/clinic/bytesobject.c.h b/Objects/clinic/bytesobject.c.h index 315f6f2..9c358b5 100644 --- a/Objects/clinic/bytesobject.c.h +++ b/Objects/clinic/bytesobject.c.h @@ -86,7 +86,7 @@ PyDoc_STRVAR(bytes_rpartition__doc__, "\n" "Partition the bytes into three parts using the given separator.\n" "\n" -"This will search for the separator sep in the bytes, starting and the end. If\n" +"This will search for the separator sep in the bytes, starting at the end. If\n" "the separator is found, returns a 3-tuple containing the part before the\n" "separator, the separator itself, and the part after it.\n" "\n" @@ -499,4 +499,4 @@ bytes_fromhex(PyTypeObject *type, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=9e3374bd7d04c163 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fc9e02359cc56d36 input=a9049054013a1b77]*/ diff --git a/Objects/clinic/unicodeobject.c.h b/Objects/clinic/unicodeobject.c.h index ca90e6d..0936527 100644 --- a/Objects/clinic/unicodeobject.c.h +++ b/Objects/clinic/unicodeobject.c.h @@ -682,7 +682,7 @@ PyDoc_STRVAR(unicode_rpartition__doc__, "\n" "Partition the string into three parts using the given separator.\n" "\n" -"This will search for the separator in the string, starting and the end. If\n" +"This will search for the separator in the string, starting at the end. If\n" "the separator is found, returns a 3-tuple containing the part before the\n" "separator, the separator itself, and the part after it.\n" "\n" @@ -930,4 +930,4 @@ unicode_sizeof(PyObject *self, PyObject *Py_UNUSED(ignored)) { return unicode_sizeof_impl(self); } -/*[clinic end generated code: output=8fd799fd7f2cc724 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=816292e81a8a732e input=a9049054013a1b77]*/ |