Skip to content

bpo-25433: Align bytearray strip methods to those found in byteobject.c #14771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rompe wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bpo-25433: Align bytearray strip methods to those found in byteobject.c #14771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c5834d
Align bytearray.strip, .rstrip, .lstrip to their bytes counterparts.
Jul 13, 2019
c016eb7
Update clinic signatures.
Jul 14, 2019
a6962a0
Add NEWS entry for the bytearray.strip, .lstrip, .rstrip alignments.
Jul 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-07-14-14-48-50.bpo-25433.T1O9mC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Align ``bytearray.strip``, ``.lstrip``, ``.rstrip`` to their ``bytes``
counterparts.

Speedup ranges between 0% when stripping custom bytes and 8% when stripping
whitespace.
153 changes: 70 additions & 83 deletions Objects/bytearrayobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,26 +1780,78 @@ bytearray_remove_impl(PyByteArrayObject *self, int value)
Py_RETURN_NONE;
}

/* XXX These two helpers could be optimized if argsize == 1 */
#define LEFTSTRIP 0
#define RIGHTSTRIP 1
#define BOTHSTRIP 2

static Py_ssize_t
lstrip_helper(const char *myptr, Py_ssize_t mysize,
const void *argptr, Py_ssize_t argsize)
static PyObject *
do_xstrip(PyByteArrayObject *self, int striptype, PyObject *sepobj)
{
Py_ssize_t i = 0;
while (i < mysize && memchr(argptr, (unsigned char) myptr[i], argsize))
i++;
return i;
Py_buffer vsep;
char *s = PyByteArray_AS_STRING(self);
Py_ssize_t len = PyByteArray_GET_SIZE(self);
char *sep;
Py_ssize_t seplen;
Py_ssize_t i, j;

if (PyObject_GetBuffer(sepobj, &vsep, PyBUF_SIMPLE) != 0)
return NULL;
sep = vsep.buf;
seplen = vsep.len;

i = 0;
if (striptype != RIGHTSTRIP) {
while (i < len && memchr(sep, Py_CHARMASK(s[i]), seplen)) {
i++;
}
}

j = len;
if (striptype != LEFTSTRIP) {
do {
j--;
} while (j >= i && memchr(sep, Py_CHARMASK(s[j]), seplen));
j++;
}

PyBuffer_Release(&vsep);

return PyByteArray_FromStringAndSize(s+i, j-i);
}

static Py_ssize_t
rstrip_helper(const char *myptr, Py_ssize_t mysize,
const void *argptr, Py_ssize_t argsize)

static PyObject *
do_strip(PyByteArrayObject *self, int striptype)
{
char *s = PyByteArray_AS_STRING(self);
Py_ssize_t len = PyByteArray_GET_SIZE(self), i, j;

i = 0;
if (striptype != RIGHTSTRIP) {
while (i < len && Py_ISSPACE(s[i])) {
i++;
}
}

j = len;
if (striptype != LEFTSTRIP) {
do {
j--;
} while (j >= i && Py_ISSPACE(s[j]));
j++;
}

return PyByteArray_FromStringAndSize(s+i, j-i);
}


static PyObject *
do_argstrip(PyByteArrayObject *self, int striptype, PyObject *bytes)
{
Py_ssize_t i = mysize - 1;
while (i >= 0 && memchr(argptr, (unsigned char) myptr[i], argsize))
i--;
return i + 1;
if (bytes != NULL && bytes != Py_None) {
return do_xstrip(self, striptype, bytes);
}
return do_strip(self, striptype);
}

/*[clinic input]
Expand All @@ -1817,31 +1869,7 @@ static PyObject *
bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=760412661a34ad5a input=ef7bb59b09c21d62]*/
{
Py_ssize_t left, right, mysize, byteslen;
char *myptr;
const char *bytesptr;
Py_buffer vbytes;

if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
if (left == mysize)
right = left;
else
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr + left, right - left);
return do_argstrip(self, BOTHSTRIP, bytes);
}

/*[clinic input]
Expand All @@ -1859,28 +1887,7 @@ static PyObject *
bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=d005c9d0ab909e66 input=80843f975dd7c480]*/
{
Py_ssize_t left, right, mysize, byteslen;
char *myptr;
const char *bytesptr;
Py_buffer vbytes;

if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
right = mysize;
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr + left, right - left);
return do_argstrip(self, LEFTSTRIP, bytes);
}

/*[clinic input]
Expand All @@ -1898,27 +1905,7 @@ static PyObject *
bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes)
/*[clinic end generated code: output=030e2fbd2f7276bd input=e728b994954cfd91]*/
{
Py_ssize_t right, mysize, byteslen;
char *myptr;
const char *bytesptr;
Py_buffer vbytes;

if (bytes == Py_None) {
bytesptr = "\t\n\r\f\v ";
byteslen = 6;
}
else {
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
return NULL;
bytesptr = (const char *) vbytes.buf;
byteslen = vbytes.len;
}
myptr = PyByteArray_AS_STRING(self);
mysize = Py_SIZE(self);
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
if (bytes != Py_None)
PyBuffer_Release(&vbytes);
return PyByteArray_FromStringAndSize(myptr, right);
return do_argstrip(self, RIGHTSTRIP, bytes);
}

/*[clinic input]
Expand Down