2008-05-26 10:42:13 -03:00
|
|
|
/* PyByteArray (bytearray) implementation */
|
|
|
|
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
|
|
#include "structmember.h"
|
|
|
|
#include "bytes_methods.h"
|
2015-01-24 00:05:18 -04:00
|
|
|
#include "bytesobject.h"
|
2015-04-25 20:22:26 -03:00
|
|
|
#include "pystrhex.h"
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
class bytearray "PyByteArrayObject *" "&PyByteArray_Type"
|
|
|
|
[clinic start generated code]*/
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=5535b77c37a119e0]*/
|
|
|
|
|
2010-01-17 08:38:54 -04:00
|
|
|
char _PyByteArray_empty_string[] = "";
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
void
|
|
|
|
PyByteArray_Fini(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
PyByteArray_Init(void)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* end nullbytes support */
|
|
|
|
|
|
|
|
/* Helpers */
|
|
|
|
|
|
|
|
static int
|
|
|
|
_getbytevalue(PyObject* arg, int *value)
|
|
|
|
{
|
|
|
|
long face_value;
|
|
|
|
|
|
|
|
if (PyLong_Check(arg)) {
|
|
|
|
face_value = PyLong_AsLong(arg);
|
2008-07-16 20:15:30 -03:00
|
|
|
} else {
|
|
|
|
PyObject *index = PyNumber_Index(arg);
|
|
|
|
if (index == NULL) {
|
|
|
|
PyErr_Format(PyExc_TypeError, "an integer is required");
|
2010-07-09 16:25:48 -03:00
|
|
|
*value = -1;
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
}
|
2008-07-16 20:15:30 -03:00
|
|
|
face_value = PyLong_AsLong(index);
|
|
|
|
Py_DECREF(index);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (face_value < 0 || face_value >= 256) {
|
|
|
|
/* this includes the OverflowError in case the long is too large */
|
|
|
|
PyErr_SetString(PyExc_ValueError, "byte must be in range(0, 256)");
|
2010-07-09 16:25:48 -03:00
|
|
|
*value = -1;
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*value = face_value;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
if (view == NULL) {
|
2015-02-03 11:57:21 -04:00
|
|
|
PyErr_SetString(PyExc_BufferError,
|
|
|
|
"bytearray_getbuffer: view==NULL argument is obsolete");
|
|
|
|
return -1;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2010-01-17 08:38:54 -04:00
|
|
|
ptr = (void *) PyByteArray_AS_STRING(obj);
|
2015-02-03 11:57:21 -04:00
|
|
|
/* cannot fail if view != NULL and readonly == 0 */
|
|
|
|
(void)PyBuffer_FillInfo(view, (PyObject*)obj, ptr, Py_SIZE(obj), 0, flags);
|
|
|
|
obj->ob_exports++;
|
|
|
|
return 0;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_releasebuffer(PyByteArrayObject *obj, Py_buffer *view)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
obj->ob_exports--;
|
|
|
|
}
|
|
|
|
|
2008-12-06 17:27:53 -04:00
|
|
|
static int
|
|
|
|
_canresize(PyByteArrayObject *self)
|
|
|
|
{
|
|
|
|
if (self->ob_exports > 0) {
|
|
|
|
PyErr_SetString(PyExc_BufferError,
|
|
|
|
"Existing exports of data: object cannot be re-sized");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-04-03 17:53:51 -03:00
|
|
|
#include "clinic/bytearrayobject.c.h"
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
/* Direct API functions */
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyByteArray_FromObject(PyObject *input)
|
|
|
|
{
|
2016-12-04 17:59:09 -04:00
|
|
|
return PyObject_CallFunctionObjArgs((PyObject *)&PyByteArray_Type,
|
|
|
|
input, NULL);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyByteArray_FromStringAndSize(const char *bytes, Py_ssize_t size)
|
|
|
|
{
|
|
|
|
PyByteArrayObject *new;
|
|
|
|
Py_ssize_t alloc;
|
|
|
|
|
|
|
|
if (size < 0) {
|
|
|
|
PyErr_SetString(PyExc_SystemError,
|
|
|
|
"Negative size passed to PyByteArray_FromStringAndSize");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-08-24 04:08:55 -03:00
|
|
|
/* Prevent buffer overflow when setting alloc to size+1. */
|
|
|
|
if (size == PY_SSIZE_T_MAX) {
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
new = PyObject_New(PyByteArrayObject, &PyByteArray_Type);
|
|
|
|
if (new == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (size == 0) {
|
|
|
|
new->ob_bytes = NULL;
|
|
|
|
alloc = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
alloc = size + 1;
|
2011-11-12 16:15:28 -04:00
|
|
|
new->ob_bytes = PyObject_Malloc(alloc);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (new->ob_bytes == NULL) {
|
|
|
|
Py_DECREF(new);
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
2010-01-17 08:38:54 -04:00
|
|
|
if (bytes != NULL && size > 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
memcpy(new->ob_bytes, bytes, size);
|
|
|
|
new->ob_bytes[size] = '\0'; /* Trailing null byte */
|
|
|
|
}
|
|
|
|
Py_SIZE(new) = size;
|
|
|
|
new->ob_alloc = alloc;
|
2013-10-05 16:12:18 -03:00
|
|
|
new->ob_start = new->ob_bytes;
|
2008-05-26 10:42:13 -03:00
|
|
|
new->ob_exports = 0;
|
|
|
|
|
|
|
|
return (PyObject *)new;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_ssize_t
|
|
|
|
PyByteArray_Size(PyObject *self)
|
|
|
|
{
|
|
|
|
assert(self != NULL);
|
|
|
|
assert(PyByteArray_Check(self));
|
|
|
|
|
|
|
|
return PyByteArray_GET_SIZE(self);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
PyByteArray_AsString(PyObject *self)
|
|
|
|
{
|
|
|
|
assert(self != NULL);
|
|
|
|
assert(PyByteArray_Check(self));
|
|
|
|
|
|
|
|
return PyByteArray_AS_STRING(self);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2014-11-02 13:40:09 -04:00
|
|
|
PyByteArray_Resize(PyObject *self, Py_ssize_t requested_size)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
void *sval;
|
2013-10-05 16:12:18 -03:00
|
|
|
PyByteArrayObject *obj = ((PyByteArrayObject *)self);
|
2014-11-02 13:40:09 -04:00
|
|
|
/* All computations are done unsigned to avoid integer overflows
|
|
|
|
(see issue #22335). */
|
|
|
|
size_t alloc = (size_t) obj->ob_alloc;
|
|
|
|
size_t logical_offset = (size_t) (obj->ob_start - obj->ob_bytes);
|
|
|
|
size_t size = (size_t) requested_size;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
assert(self != NULL);
|
|
|
|
assert(PyByteArray_Check(self));
|
2013-10-05 16:12:18 -03:00
|
|
|
assert(logical_offset <= alloc);
|
2014-11-02 13:40:09 -04:00
|
|
|
assert(requested_size >= 0);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2014-11-02 13:40:09 -04:00
|
|
|
if (requested_size == Py_SIZE(self)) {
|
2008-12-06 17:27:53 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
if (!_canresize(obj)) {
|
2008-12-06 17:27:53 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-05-19 15:52:27 -03:00
|
|
|
if (size + logical_offset + 1 <= alloc) {
|
2013-10-05 16:12:18 -03:00
|
|
|
/* Current buffer is large enough to host the requested size,
|
|
|
|
decide on a strategy. */
|
|
|
|
if (size < alloc / 2) {
|
|
|
|
/* Major downsize; resize down to exact size */
|
|
|
|
alloc = size + 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Minor downsize; quick exit */
|
|
|
|
Py_SIZE(self) = size;
|
|
|
|
PyByteArray_AS_STRING(self)[size] = '\0'; /* Trailing null */
|
|
|
|
return 0;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
2013-10-05 16:12:18 -03:00
|
|
|
/* Need growing, decide on a strategy */
|
|
|
|
if (size <= alloc * 1.125) {
|
|
|
|
/* Moderate upsize; overallocate similar to list_resize() */
|
|
|
|
alloc = size + (size >> 3) + (size < 9 ? 3 : 6);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Major upsize; resize up to exact size */
|
|
|
|
alloc = size + 1;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2014-11-02 13:40:09 -04:00
|
|
|
if (alloc > PY_SSIZE_T_MAX) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
if (logical_offset > 0) {
|
|
|
|
sval = PyObject_Malloc(alloc);
|
|
|
|
if (sval == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
2014-11-02 13:40:09 -04:00
|
|
|
memcpy(sval, PyByteArray_AS_STRING(self),
|
|
|
|
Py_MIN(requested_size, Py_SIZE(self)));
|
2013-10-05 16:12:18 -03:00
|
|
|
PyObject_Free(obj->ob_bytes);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sval = PyObject_Realloc(obj->ob_bytes, alloc);
|
|
|
|
if (sval == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
obj->ob_bytes = obj->ob_start = sval;
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_SIZE(self) = size;
|
2013-10-05 16:12:18 -03:00
|
|
|
obj->ob_alloc = alloc;
|
|
|
|
obj->ob_bytes[size] = '\0'; /* Trailing null byte */
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyByteArray_Concat(PyObject *a, PyObject *b)
|
|
|
|
{
|
|
|
|
Py_buffer va, vb;
|
|
|
|
PyByteArrayObject *result = NULL;
|
|
|
|
|
|
|
|
va.len = -1;
|
|
|
|
vb.len = -1;
|
2015-02-02 19:21:08 -04:00
|
|
|
if (PyObject_GetBuffer(a, &va, PyBUF_SIMPLE) != 0 ||
|
|
|
|
PyObject_GetBuffer(b, &vb, PyBUF_SIMPLE) != 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
|
|
|
|
Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2016-07-10 14:48:43 -03:00
|
|
|
if (va.len > PY_SSIZE_T_MAX - vb.len) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
goto done;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2016-07-10 14:48:43 -03:00
|
|
|
result = (PyByteArrayObject *) \
|
|
|
|
PyByteArray_FromStringAndSize(NULL, va.len + vb.len);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (result != NULL) {
|
|
|
|
memcpy(result->ob_bytes, va.buf, va.len);
|
|
|
|
memcpy(result->ob_bytes + va.len, vb.buf, vb.len);
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (va.len != -1)
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&va);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (vb.len != -1)
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vb);
|
2008-05-26 10:42:13 -03:00
|
|
|
return (PyObject *)result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Functions stuffed into the type object */
|
|
|
|
|
|
|
|
static Py_ssize_t
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_length(PyByteArrayObject *self)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
return Py_SIZE(self);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_iconcat(PyByteArrayObject *self, PyObject *other)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t size;
|
|
|
|
Py_buffer vo;
|
|
|
|
|
2015-02-02 19:21:08 -04:00
|
|
|
if (PyObject_GetBuffer(other, &vo, PyBUF_SIMPLE) != 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s",
|
|
|
|
Py_TYPE(other)->tp_name, Py_TYPE(self)->tp_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-07-10 14:48:43 -03:00
|
|
|
size = Py_SIZE(self);
|
|
|
|
if (size > PY_SSIZE_T_MAX - vo.len) {
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vo);
|
2008-05-26 10:42:13 -03:00
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
2016-07-10 14:48:43 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)self, size + vo.len) < 0) {
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vo);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2016-07-10 14:48:43 -03:00
|
|
|
memcpy(PyByteArray_AS_STRING(self) + size, vo.buf, vo.len);
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vo);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_INCREF(self);
|
|
|
|
return (PyObject *)self;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_repeat(PyByteArrayObject *self, Py_ssize_t count)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
PyByteArrayObject *result;
|
|
|
|
Py_ssize_t mysize;
|
|
|
|
Py_ssize_t size;
|
|
|
|
|
|
|
|
if (count < 0)
|
|
|
|
count = 0;
|
|
|
|
mysize = Py_SIZE(self);
|
2010-08-10 15:35:01 -03:00
|
|
|
if (count > 0 && mysize > PY_SSIZE_T_MAX / count)
|
2008-05-26 10:42:13 -03:00
|
|
|
return PyErr_NoMemory();
|
2010-08-10 15:35:01 -03:00
|
|
|
size = mysize * count;
|
2008-05-26 10:42:13 -03:00
|
|
|
result = (PyByteArrayObject *)PyByteArray_FromStringAndSize(NULL, size);
|
|
|
|
if (result != NULL && size != 0) {
|
|
|
|
if (mysize == 1)
|
|
|
|
memset(result->ob_bytes, self->ob_bytes[0], size);
|
|
|
|
else {
|
|
|
|
Py_ssize_t i;
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
memcpy(result->ob_bytes + i*mysize, self->ob_bytes, mysize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (PyObject *)result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_irepeat(PyByteArrayObject *self, Py_ssize_t count)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t mysize;
|
|
|
|
Py_ssize_t size;
|
2013-10-05 16:12:18 -03:00
|
|
|
char *buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (count < 0)
|
|
|
|
count = 0;
|
|
|
|
mysize = Py_SIZE(self);
|
2010-08-10 15:35:01 -03:00
|
|
|
if (count > 0 && mysize > PY_SSIZE_T_MAX / count)
|
2008-05-26 10:42:13 -03:00
|
|
|
return PyErr_NoMemory();
|
2010-08-10 15:35:01 -03:00
|
|
|
size = mysize * count;
|
2013-10-05 16:12:18 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)self, size) < 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (mysize == 1)
|
2013-10-05 16:12:18 -03:00
|
|
|
memset(buf, buf[0], size);
|
2008-05-26 10:42:13 -03:00
|
|
|
else {
|
|
|
|
Py_ssize_t i;
|
|
|
|
for (i = 1; i < count; i++)
|
2013-10-05 16:12:18 -03:00
|
|
|
memcpy(buf + i*mysize, buf, mysize);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
Py_INCREF(self);
|
|
|
|
return (PyObject *)self;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_getitem(PyByteArrayObject *self, Py_ssize_t i)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
if (i < 0)
|
|
|
|
i += Py_SIZE(self);
|
|
|
|
if (i < 0 || i >= Py_SIZE(self)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyLong_FromLong((unsigned char)(PyByteArray_AS_STRING(self)[i]));
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_subscript(PyByteArrayObject *self, PyObject *index)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2008-07-16 20:15:30 -03:00
|
|
|
if (PyIndex_Check(index)) {
|
|
|
|
Py_ssize_t i = PyNumber_AsSsize_t(index, PyExc_IndexError);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (i < 0)
|
|
|
|
i += PyByteArray_GET_SIZE(self);
|
|
|
|
|
|
|
|
if (i < 0 || i >= Py_SIZE(self)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyLong_FromLong((unsigned char)(PyByteArray_AS_STRING(self)[i]));
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2008-07-16 20:15:30 -03:00
|
|
|
else if (PySlice_Check(index)) {
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_ssize_t start, stop, step, slicelength, cur, i;
|
2010-12-03 16:14:31 -04:00
|
|
|
if (PySlice_GetIndicesEx(index,
|
2008-05-26 10:42:13 -03:00
|
|
|
PyByteArray_GET_SIZE(self),
|
|
|
|
&start, &stop, &step, &slicelength) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (slicelength <= 0)
|
|
|
|
return PyByteArray_FromStringAndSize("", 0);
|
|
|
|
else if (step == 1) {
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyByteArray_FromStringAndSize(
|
|
|
|
PyByteArray_AS_STRING(self) + start, slicelength);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
char *source_buf = PyByteArray_AS_STRING(self);
|
2009-04-03 03:38:02 -03:00
|
|
|
char *result_buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
PyObject *result;
|
|
|
|
|
2009-04-03 03:38:02 -03:00
|
|
|
result = PyByteArray_FromStringAndSize(NULL, slicelength);
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2009-04-03 03:38:02 -03:00
|
|
|
result_buf = PyByteArray_AS_STRING(result);
|
2008-05-26 10:42:13 -03:00
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
|
|
cur += step, i++) {
|
|
|
|
result_buf[i] = source_buf[cur];
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2014-08-02 02:30:37 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"bytearray indices must be integers or slices, not %.200s",
|
|
|
|
Py_TYPE(index)->tp_name);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
static int
|
|
|
|
bytearray_setslice_linear(PyByteArrayObject *self,
|
|
|
|
Py_ssize_t lo, Py_ssize_t hi,
|
|
|
|
char *bytes, Py_ssize_t bytes_len)
|
|
|
|
{
|
|
|
|
Py_ssize_t avail = hi - lo;
|
|
|
|
char *buf = PyByteArray_AS_STRING(self);
|
|
|
|
Py_ssize_t growth = bytes_len - avail;
|
2013-11-21 07:29:51 -04:00
|
|
|
int res = 0;
|
2013-10-05 16:12:18 -03:00
|
|
|
assert(avail >= 0);
|
|
|
|
|
2013-11-21 07:29:51 -04:00
|
|
|
if (growth < 0) {
|
|
|
|
if (!_canresize(self))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (lo == 0) {
|
|
|
|
/* Shrink the buffer by advancing its logical start */
|
|
|
|
self->ob_start -= growth;
|
|
|
|
/*
|
|
|
|
0 lo hi old_size
|
|
|
|
| |<----avail----->|<-----tail------>|
|
|
|
|
| |<-bytes_len->|<-----tail------>|
|
|
|
|
0 new_lo new_hi new_size
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*
|
|
|
|
0 lo hi old_size
|
|
|
|
| |<----avail----->|<-----tomove------>|
|
|
|
|
| |<-bytes_len->|<-----tomove------>|
|
|
|
|
0 lo new_hi new_size
|
|
|
|
*/
|
|
|
|
memmove(buf + lo + bytes_len, buf + hi,
|
|
|
|
Py_SIZE(self) - hi);
|
|
|
|
}
|
|
|
|
if (PyByteArray_Resize((PyObject *)self,
|
|
|
|
Py_SIZE(self) + growth) < 0) {
|
|
|
|
/* Issue #19578: Handling the memory allocation failure here is
|
|
|
|
tricky here because the bytearray object has already been
|
|
|
|
modified. Depending on growth and lo, the behaviour is
|
|
|
|
different.
|
|
|
|
|
|
|
|
If growth < 0 and lo != 0, the operation is completed, but a
|
|
|
|
MemoryError is still raised and the memory block is not
|
2016-08-30 14:47:49 -03:00
|
|
|
shrunk. Otherwise, the bytearray is restored in its previous
|
2013-11-21 07:29:51 -04:00
|
|
|
state and a MemoryError is raised. */
|
2013-10-05 16:12:18 -03:00
|
|
|
if (lo == 0) {
|
2013-11-21 07:29:51 -04:00
|
|
|
self->ob_start += growth;
|
|
|
|
return -1;
|
2013-10-05 16:12:18 -03:00
|
|
|
}
|
2013-11-21 07:29:51 -04:00
|
|
|
/* memmove() removed bytes, the bytearray object cannot be
|
|
|
|
restored in its previous state. */
|
|
|
|
Py_SIZE(self) += growth;
|
|
|
|
res = -1;
|
2013-10-05 16:12:18 -03:00
|
|
|
}
|
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2013-11-21 07:29:51 -04:00
|
|
|
}
|
|
|
|
else if (growth > 0) {
|
|
|
|
if (Py_SIZE(self) > (Py_ssize_t)PY_SSIZE_T_MAX - growth) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return -1;
|
2013-10-05 16:12:18 -03:00
|
|
|
}
|
2013-11-21 07:29:51 -04:00
|
|
|
|
|
|
|
if (PyByteArray_Resize((PyObject *)self,
|
|
|
|
Py_SIZE(self) + growth) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
buf = PyByteArray_AS_STRING(self);
|
|
|
|
/* Make the place for the additional bytes */
|
|
|
|
/*
|
|
|
|
0 lo hi old_size
|
|
|
|
| |<-avail->|<-----tomove------>|
|
|
|
|
| |<---bytes_len-->|<-----tomove------>|
|
|
|
|
0 lo new_hi new_size
|
|
|
|
*/
|
|
|
|
memmove(buf + lo + bytes_len, buf + hi,
|
|
|
|
Py_SIZE(self) - lo - bytes_len);
|
2013-10-05 16:12:18 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (bytes_len > 0)
|
|
|
|
memcpy(buf + lo, bytes, bytes_len);
|
2013-11-21 07:29:51 -04:00
|
|
|
return res;
|
2013-10-05 16:12:18 -03:00
|
|
|
}
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
|
2008-05-26 10:42:13 -03:00
|
|
|
PyObject *values)
|
|
|
|
{
|
2013-10-05 16:12:18 -03:00
|
|
|
Py_ssize_t needed;
|
2008-05-26 10:42:13 -03:00
|
|
|
void *bytes;
|
|
|
|
Py_buffer vbytes;
|
|
|
|
int res = 0;
|
|
|
|
|
|
|
|
vbytes.len = -1;
|
|
|
|
if (values == (PyObject *)self) {
|
|
|
|
/* Make a copy and call this function recursively */
|
|
|
|
int err;
|
|
|
|
values = PyByteArray_FromObject(values);
|
|
|
|
if (values == NULL)
|
|
|
|
return -1;
|
2009-04-18 12:42:12 -03:00
|
|
|
err = bytearray_setslice(self, lo, hi, values);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_DECREF(values);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
if (values == NULL) {
|
|
|
|
/* del b[lo:hi] */
|
|
|
|
bytes = NULL;
|
|
|
|
needed = 0;
|
|
|
|
}
|
|
|
|
else {
|
2015-02-02 19:21:08 -04:00
|
|
|
if (PyObject_GetBuffer(values, &vbytes, PyBUF_SIMPLE) != 0) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"can't set bytearray slice from %.100s",
|
|
|
|
Py_TYPE(values)->tp_name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
needed = vbytes.len;
|
|
|
|
bytes = vbytes.buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (lo < 0)
|
|
|
|
lo = 0;
|
|
|
|
if (hi < lo)
|
|
|
|
hi = lo;
|
|
|
|
if (hi > Py_SIZE(self))
|
|
|
|
hi = Py_SIZE(self);
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
res = bytearray_setslice_linear(self, lo, hi, bytes, needed);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (vbytes.len != -1)
|
2013-10-05 16:12:18 -03:00
|
|
|
PyBuffer_Release(&vbytes);
|
2008-05-26 10:42:13 -03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_setitem(PyByteArrayObject *self, Py_ssize_t i, PyObject *value)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2008-07-16 20:15:30 -03:00
|
|
|
int ival;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (i < 0)
|
|
|
|
i += Py_SIZE(self);
|
|
|
|
|
|
|
|
if (i < 0 || i >= Py_SIZE(self)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value == NULL)
|
2009-04-18 12:42:12 -03:00
|
|
|
return bytearray_setslice(self, i, i+1, NULL);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2008-07-16 20:15:30 -03:00
|
|
|
if (!_getbytevalue(value, &ival))
|
2008-05-26 10:42:13 -03:00
|
|
|
return -1;
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
PyByteArray_AS_STRING(self)[i] = ival;
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *values)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t start, stop, step, slicelen, needed;
|
2013-10-05 16:12:18 -03:00
|
|
|
char *buf, *bytes;
|
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2008-07-16 20:15:30 -03:00
|
|
|
if (PyIndex_Check(index)) {
|
|
|
|
Py_ssize_t i = PyNumber_AsSsize_t(index, PyExc_IndexError);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (i < 0)
|
|
|
|
i += PyByteArray_GET_SIZE(self);
|
|
|
|
|
|
|
|
if (i < 0 || i >= Py_SIZE(self)) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (values == NULL) {
|
|
|
|
/* Fall through to slice assignment */
|
|
|
|
start = i;
|
|
|
|
stop = i + 1;
|
|
|
|
step = 1;
|
|
|
|
slicelen = 1;
|
|
|
|
}
|
|
|
|
else {
|
2008-07-16 20:15:30 -03:00
|
|
|
int ival;
|
|
|
|
if (!_getbytevalue(values, &ival))
|
2008-05-26 10:42:13 -03:00
|
|
|
return -1;
|
2013-10-05 16:12:18 -03:00
|
|
|
buf[i] = (char)ival;
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2008-07-16 20:15:30 -03:00
|
|
|
else if (PySlice_Check(index)) {
|
2010-12-03 16:14:31 -04:00
|
|
|
if (PySlice_GetIndicesEx(index,
|
2008-05-26 10:42:13 -03:00
|
|
|
PyByteArray_GET_SIZE(self),
|
|
|
|
&start, &stop, &step, &slicelen) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2014-08-02 02:30:37 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"bytearray indices must be integers or slices, not %.200s",
|
|
|
|
Py_TYPE(index)->tp_name);
|
2008-05-26 10:42:13 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (values == NULL) {
|
|
|
|
bytes = NULL;
|
|
|
|
needed = 0;
|
|
|
|
}
|
|
|
|
else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
|
2012-11-03 19:07:59 -03:00
|
|
|
int err;
|
2012-11-03 16:19:06 -03:00
|
|
|
if (PyNumber_Check(values) || PyUnicode_Check(values)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"can assign only bytes, buffers, or iterables "
|
|
|
|
"of ints in range(0, 256)");
|
|
|
|
return -1;
|
|
|
|
}
|
2010-12-04 13:09:30 -04:00
|
|
|
/* Make a copy and call this function recursively */
|
2008-05-26 10:42:13 -03:00
|
|
|
values = PyByteArray_FromObject(values);
|
|
|
|
if (values == NULL)
|
|
|
|
return -1;
|
2009-04-18 12:42:12 -03:00
|
|
|
err = bytearray_ass_subscript(self, index, values);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_DECREF(values);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(PyByteArray_Check(values));
|
2013-10-05 16:12:18 -03:00
|
|
|
bytes = PyByteArray_AS_STRING(values);
|
2008-05-26 10:42:13 -03:00
|
|
|
needed = Py_SIZE(values);
|
|
|
|
}
|
|
|
|
/* Make sure b[5:2] = ... inserts before 5, not before 2. */
|
|
|
|
if ((step < 0 && start < stop) ||
|
|
|
|
(step > 0 && start > stop))
|
|
|
|
stop = start;
|
|
|
|
if (step == 1) {
|
2013-10-05 16:12:18 -03:00
|
|
|
return bytearray_setslice_linear(self, start, stop, bytes, needed);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (needed == 0) {
|
|
|
|
/* Delete slice */
|
2010-01-29 13:27:24 -04:00
|
|
|
size_t cur;
|
|
|
|
Py_ssize_t i;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2008-12-06 17:27:53 -04:00
|
|
|
if (!_canresize(self))
|
|
|
|
return -1;
|
2010-08-06 18:33:18 -03:00
|
|
|
|
|
|
|
if (slicelen == 0)
|
|
|
|
/* Nothing to do here. */
|
|
|
|
return 0;
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
if (step < 0) {
|
|
|
|
stop = start + 1;
|
|
|
|
start = stop + step * (slicelen - 1) - 1;
|
|
|
|
step = -step;
|
|
|
|
}
|
|
|
|
for (cur = start, i = 0;
|
|
|
|
i < slicelen; cur += step, i++) {
|
|
|
|
Py_ssize_t lim = step - 1;
|
|
|
|
|
2010-02-14 08:53:32 -04:00
|
|
|
if (cur + step >= (size_t)PyByteArray_GET_SIZE(self))
|
2008-05-26 10:42:13 -03:00
|
|
|
lim = PyByteArray_GET_SIZE(self) - cur - 1;
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
memmove(buf + cur - i,
|
|
|
|
buf + cur + 1, lim);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
/* Move the tail of the bytes, in one chunk */
|
2010-08-06 18:33:18 -03:00
|
|
|
cur = start + (size_t)slicelen*step;
|
2010-02-14 08:53:32 -04:00
|
|
|
if (cur < (size_t)PyByteArray_GET_SIZE(self)) {
|
2013-10-05 16:12:18 -03:00
|
|
|
memmove(buf + cur - slicelen,
|
|
|
|
buf + cur,
|
2008-05-26 10:42:13 -03:00
|
|
|
PyByteArray_GET_SIZE(self) - cur);
|
|
|
|
}
|
|
|
|
if (PyByteArray_Resize((PyObject *)self,
|
|
|
|
PyByteArray_GET_SIZE(self) - slicelen) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Assign slice */
|
2010-08-06 18:33:18 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
size_t cur;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (needed != slicelen) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"attempt to assign bytes of size %zd "
|
|
|
|
"to extended slice of size %zd",
|
|
|
|
needed, slicelen);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for (cur = start, i = 0; i < slicelen; cur += step, i++)
|
2013-10-05 16:12:18 -03:00
|
|
|
buf[cur] = bytes[i];
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_init(PyByteArrayObject *self, PyObject *args, PyObject *kwds)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
static char *kwlist[] = {"source", "encoding", "errors", 0};
|
|
|
|
PyObject *arg = NULL;
|
|
|
|
const char *encoding = NULL;
|
|
|
|
const char *errors = NULL;
|
|
|
|
Py_ssize_t count;
|
|
|
|
PyObject *it;
|
|
|
|
PyObject *(*iternext)(PyObject *);
|
|
|
|
|
|
|
|
if (Py_SIZE(self) != 0) {
|
|
|
|
/* Empty previous contents (yes, do this first of all!) */
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, 0) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse arguments */
|
Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines
Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines
#3045: fix pydoc behavior for TEMP path with spaces.
........
r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines
#1608818: errno can get set by every call to readdir().
........
r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines
#3305: self->stream can be NULL.
........
r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines
#3345: fix docstring.
........
r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines
#3312: fix two sqlite3 crashes.
........
r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines
#3388: add a paragraph about using "with" for file objects.
........
r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines
news note for r63052
........
r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines
Fix issue 3395, update _debugInfo to be _debug_info
........
r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines
Last bit of a fix for issue3381 (addon for my patch in r65061)
........
r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line
Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines
Remove duplicate entry in __all__.
........
r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines
Correct attribute name.
........
r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines
Document the different meaning of precision for {:f} and {:g}.
Also document how inf and nan are formatted. #3404.
........
r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line
Improve accuracy of gamma test function
........
r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line
Add recipe to the itertools docs.
........
r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines
#3378: in case of no memory, don't leak even more memory. :)
........
r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines
#3302: fix segfaults when passing None for arguments that can't
be NULL for the C functions.
........
r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines
#3303: fix crash with invalid Py_DECREF in strcoll().
........
r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines
#3319: don't raise ZeroDivisionError if number of rounds is so
low that benchtime is zero.
........
r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines
#3323: mention that if inheriting from a class without __slots__,
the subclass will have a __dict__ available too.
........
r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines
Add ordering info for findall and finditer.
........
r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line
Fix compress() recipe in docs to use itertools.
........
r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line
Clean-up itertools docs and recipes.
........
r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines
fix issue3120 - don't truncate handles on 64-bit Windows.
This is still messy, realistically PC/_subprocess.c should never cast pointers
to python numbers and back at all.
I don't have a 64-bit windows build environment because microsoft apparently
thinks that should cost money. Time to watch the buildbots. It builds and
passes tests on 32-bit windows.
........
r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines
#926501: add info where to put the docstring.
........
r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line
Fix a couple of names in error messages that were wrong
........
r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line
Fix misspeeld method name (negative)
........
r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines
Increment version number in NEWS file, and move items that were added after 2.6b2.
(I thought there was a script to automate this kind of updates)
........
r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines
Issue2378: pdb would delete free variables when stepping into a class statement.
The problem was introduced by r53954, the correction is to restore the symmetry between
PyFrame_FastToLocals and PyFrame_LocalsToFast
........
r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line
don't use assert statement
........
r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix buglet in fix for issue3381
........
r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines
Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line
Remove out-of-date section on Exact/Inexact.
........
r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line
Tuples now have both count() and index().
........
r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line
Fix credits for math.sum()
........
r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line
One more attribution.
........
r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line
remove unneeded import
........
r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line
use isinstance
........
2008-07-23 13:10:53 -03:00
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oss:bytearray", kwlist,
|
2008-05-26 10:42:13 -03:00
|
|
|
&arg, &encoding, &errors))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Make a quick exit if no first argument */
|
|
|
|
if (arg == NULL) {
|
|
|
|
if (encoding != NULL || errors != NULL) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"encoding or errors without sequence argument");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PyUnicode_Check(arg)) {
|
|
|
|
/* Encode via the codec registry */
|
|
|
|
PyObject *encoded, *new;
|
|
|
|
if (encoding == NULL) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"string argument without an encoding");
|
|
|
|
return -1;
|
|
|
|
}
|
2008-06-06 09:18:17 -03:00
|
|
|
encoded = PyUnicode_AsEncodedString(arg, encoding, errors);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (encoded == NULL)
|
|
|
|
return -1;
|
|
|
|
assert(PyBytes_Check(encoded));
|
2009-04-18 12:42:12 -03:00
|
|
|
new = bytearray_iconcat(self, encoded);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_DECREF(encoded);
|
|
|
|
if (new == NULL)
|
|
|
|
return -1;
|
|
|
|
Py_DECREF(new);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If it's not unicode, there can't be encoding or errors */
|
|
|
|
if (encoding != NULL || errors != NULL) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"encoding or errors without a string argument");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Is it an int? */
|
2016-08-15 03:46:07 -03:00
|
|
|
if (PyIndex_Check(arg)) {
|
|
|
|
count = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
|
|
|
|
if (count == -1 && PyErr_Occurred()) {
|
2017-01-06 04:32:01 -04:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_OverflowError))
|
|
|
|
return -1;
|
|
|
|
PyErr_Clear(); /* fall through */
|
2016-08-15 03:46:07 -03:00
|
|
|
}
|
2017-01-06 04:32:01 -04:00
|
|
|
else {
|
|
|
|
if (count < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "negative count");
|
2008-05-26 10:42:13 -03:00
|
|
|
return -1;
|
2017-01-06 04:32:01 -04:00
|
|
|
}
|
|
|
|
if (count > 0) {
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, count))
|
|
|
|
return -1;
|
|
|
|
memset(PyByteArray_AS_STRING(self), 0, count);
|
|
|
|
}
|
|
|
|
return 0;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Use the buffer API */
|
|
|
|
if (PyObject_CheckBuffer(arg)) {
|
|
|
|
Py_ssize_t size;
|
|
|
|
Py_buffer view;
|
|
|
|
if (PyObject_GetBuffer(arg, &view, PyBUF_FULL_RO) < 0)
|
|
|
|
return -1;
|
|
|
|
size = view.len;
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, size) < 0) goto fail;
|
2013-10-05 16:12:18 -03:00
|
|
|
if (PyBuffer_ToContiguous(PyByteArray_AS_STRING(self),
|
|
|
|
&view, size, 'C') < 0)
|
2012-07-28 07:25:55 -03:00
|
|
|
goto fail;
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&view);
|
2008-05-26 10:42:13 -03:00
|
|
|
return 0;
|
|
|
|
fail:
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&view);
|
2008-05-26 10:42:13 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX Optimize this if the arguments is a list, tuple */
|
|
|
|
|
|
|
|
/* Get the iterator */
|
|
|
|
it = PyObject_GetIter(arg);
|
|
|
|
if (it == NULL)
|
|
|
|
return -1;
|
|
|
|
iternext = *Py_TYPE(it)->tp_iternext;
|
|
|
|
|
|
|
|
/* Run the iterator to exhaustion */
|
|
|
|
for (;;) {
|
|
|
|
PyObject *item;
|
2008-07-16 20:15:30 -03:00
|
|
|
int rc, value;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
/* Get the next item */
|
|
|
|
item = iternext(it);
|
|
|
|
if (item == NULL) {
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
if (!PyErr_ExceptionMatches(PyExc_StopIteration))
|
|
|
|
goto error;
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Interpret it as an int (__index__) */
|
2008-07-16 20:15:30 -03:00
|
|
|
rc = _getbytevalue(item, &value);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_DECREF(item);
|
2008-07-16 20:15:30 -03:00
|
|
|
if (!rc)
|
2008-05-26 10:42:13 -03:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Append the byte */
|
2015-06-29 15:14:06 -03:00
|
|
|
if (Py_SIZE(self) + 1 < self->ob_alloc) {
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_SIZE(self)++;
|
2015-06-29 15:14:06 -03:00
|
|
|
PyByteArray_AS_STRING(self)[Py_SIZE(self)] = '\0';
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
else if (PyByteArray_Resize((PyObject *)self, Py_SIZE(self)+1) < 0)
|
|
|
|
goto error;
|
2013-10-05 16:12:18 -03:00
|
|
|
PyByteArray_AS_STRING(self)[Py_SIZE(self)-1] = value;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up and return success */
|
|
|
|
Py_DECREF(it);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
/* Error handling when it != NULL */
|
|
|
|
Py_DECREF(it);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Mostly copied from string_repr, but without the
|
|
|
|
"smart quote" functionality. */
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_repr(PyByteArrayObject *self)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
const char *quote_prefix = "bytearray(b";
|
|
|
|
const char *quote_postfix = ")";
|
|
|
|
Py_ssize_t length = Py_SIZE(self);
|
2011-09-28 02:41:54 -03:00
|
|
|
/* 15 == strlen(quote_prefix) + 2 + strlen(quote_postfix) + 1 */
|
2010-02-14 08:53:32 -04:00
|
|
|
size_t newsize;
|
2008-05-26 10:42:13 -03:00
|
|
|
PyObject *v;
|
2013-08-13 15:18:52 -03:00
|
|
|
Py_ssize_t i;
|
2013-10-05 16:12:18 -03:00
|
|
|
char *bytes;
|
2013-08-13 15:18:52 -03:00
|
|
|
char c;
|
|
|
|
char *p;
|
2011-09-28 02:41:54 -03:00
|
|
|
int quote;
|
|
|
|
char *test, *start;
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
if (length > (PY_SSIZE_T_MAX - 15) / 4) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
|
|
"bytearray object is too large to make repr");
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
|
|
|
|
newsize = 15 + length * 4;
|
2011-11-12 16:15:28 -04:00
|
|
|
buffer = PyObject_Malloc(newsize);
|
2011-09-28 02:41:54 -03:00
|
|
|
if (buffer == NULL) {
|
|
|
|
PyErr_NoMemory();
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
/* Figure out which quote to use; single is preferred */
|
|
|
|
quote = '\'';
|
|
|
|
start = PyByteArray_AS_STRING(self);
|
|
|
|
for (test = start; test < start+length; ++test) {
|
|
|
|
if (*test == '"') {
|
|
|
|
quote = '\''; /* back to single */
|
|
|
|
break;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
else if (*test == '\'')
|
|
|
|
quote = '"';
|
|
|
|
}
|
|
|
|
|
|
|
|
p = buffer;
|
|
|
|
while (*quote_prefix)
|
|
|
|
*p++ = *quote_prefix++;
|
|
|
|
*p++ = quote;
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
bytes = PyByteArray_AS_STRING(self);
|
2011-09-28 02:41:54 -03:00
|
|
|
for (i = 0; i < length; i++) {
|
|
|
|
/* There's at least enough room for a hex escape
|
|
|
|
and a closing quote. */
|
|
|
|
assert(newsize - (p - buffer) >= 5);
|
2013-10-05 16:12:18 -03:00
|
|
|
c = bytes[i];
|
2011-09-28 02:41:54 -03:00
|
|
|
if (c == '\'' || c == '\\')
|
|
|
|
*p++ = '\\', *p++ = c;
|
|
|
|
else if (c == '\t')
|
|
|
|
*p++ = '\\', *p++ = 't';
|
|
|
|
else if (c == '\n')
|
|
|
|
*p++ = '\\', *p++ = 'n';
|
|
|
|
else if (c == '\r')
|
|
|
|
*p++ = '\\', *p++ = 'r';
|
|
|
|
else if (c == 0)
|
|
|
|
*p++ = '\\', *p++ = 'x', *p++ = '0', *p++ = '0';
|
|
|
|
else if (c < ' ' || c >= 0x7f) {
|
|
|
|
*p++ = '\\';
|
|
|
|
*p++ = 'x';
|
2011-10-13 21:13:11 -03:00
|
|
|
*p++ = Py_hexdigits[(c & 0xf0) >> 4];
|
|
|
|
*p++ = Py_hexdigits[c & 0xf];
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
else
|
|
|
|
*p++ = c;
|
|
|
|
}
|
|
|
|
assert(newsize - (p - buffer) >= 1);
|
|
|
|
*p++ = quote;
|
|
|
|
while (*quote_postfix) {
|
|
|
|
*p++ = *quote_postfix++;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2011-09-28 02:41:54 -03:00
|
|
|
|
|
|
|
v = PyUnicode_DecodeASCII(buffer, p - buffer, NULL);
|
2011-11-12 16:15:28 -04:00
|
|
|
PyObject_Free(buffer);
|
2011-09-28 02:41:54 -03:00
|
|
|
return v;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_str(PyObject *op)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2010-08-11 14:31:17 -03:00
|
|
|
if (Py_BytesWarningFlag) {
|
|
|
|
if (PyErr_WarnEx(PyExc_BytesWarning,
|
|
|
|
"str() on a bytearray instance", 1))
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return bytearray_repr((PyByteArrayObject*)op);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_richcompare(PyObject *self, PyObject *other, int op)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t self_size, other_size;
|
|
|
|
Py_buffer self_bytes, other_bytes;
|
|
|
|
PyObject *res;
|
|
|
|
Py_ssize_t minsize;
|
2015-05-30 11:45:22 -03:00
|
|
|
int cmp, rc;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
/* Bytes can be compared to anything that supports the (binary)
|
|
|
|
buffer API. Except that a comparison with Unicode is always an
|
|
|
|
error, even if the comparison is for equality. */
|
2015-05-30 11:45:22 -03:00
|
|
|
rc = PyObject_IsInstance(self, (PyObject*)&PyUnicode_Type);
|
|
|
|
if (!rc)
|
|
|
|
rc = PyObject_IsInstance(other, (PyObject*)&PyUnicode_Type);
|
|
|
|
if (rc < 0)
|
|
|
|
return NULL;
|
|
|
|
if (rc) {
|
2008-10-16 22:50:37 -03:00
|
|
|
if (Py_BytesWarningFlag && (op == Py_EQ || op == Py_NE)) {
|
2008-05-26 10:42:13 -03:00
|
|
|
if (PyErr_WarnEx(PyExc_BytesWarning,
|
2008-06-04 08:30:26 -03:00
|
|
|
"Comparison between bytearray and string", 1))
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-10 22:28:54 -03:00
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2015-02-02 19:21:08 -04:00
|
|
|
if (PyObject_GetBuffer(self, &self_bytes, PyBUF_SIMPLE) != 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_Clear();
|
2011-08-10 22:28:54 -03:00
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2015-02-02 19:21:08 -04:00
|
|
|
self_size = self_bytes.len;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2015-02-02 19:21:08 -04:00
|
|
|
if (PyObject_GetBuffer(other, &other_bytes, PyBUF_SIMPLE) != 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_Clear();
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&self_bytes);
|
2011-08-10 22:28:54 -03:00
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2015-02-02 19:21:08 -04:00
|
|
|
other_size = other_bytes.len;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (self_size != other_size && (op == Py_EQ || op == Py_NE)) {
|
|
|
|
/* Shortcut: if the lengths differ, the objects differ */
|
|
|
|
cmp = (op == Py_NE);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
minsize = self_size;
|
|
|
|
if (other_size < minsize)
|
|
|
|
minsize = other_size;
|
|
|
|
|
|
|
|
cmp = memcmp(self_bytes.buf, other_bytes.buf, minsize);
|
|
|
|
/* In ISO C, memcmp() guarantees to use unsigned bytes! */
|
|
|
|
|
|
|
|
if (cmp == 0) {
|
|
|
|
if (self_size < other_size)
|
|
|
|
cmp = -1;
|
|
|
|
else if (self_size > other_size)
|
|
|
|
cmp = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (op) {
|
|
|
|
case Py_LT: cmp = cmp < 0; break;
|
|
|
|
case Py_LE: cmp = cmp <= 0; break;
|
|
|
|
case Py_EQ: cmp = cmp == 0; break;
|
|
|
|
case Py_NE: cmp = cmp != 0; break;
|
|
|
|
case Py_GT: cmp = cmp > 0; break;
|
|
|
|
case Py_GE: cmp = cmp >= 0; break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res = cmp ? Py_True : Py_False;
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&self_bytes);
|
|
|
|
PyBuffer_Release(&other_bytes);
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_INCREF(res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_dealloc(PyByteArrayObject *self)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
Merged revisions 69998-69999,70002,70022-70023,70025-70026,70061,70086,70145,70171,70183,70188,70235,70244,70275,70281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69998 | benjamin.peterson | 2009-02-26 13:04:40 -0600 (Thu, 26 Feb 2009) | 1 line
the startship is rather outdated now
........
r69999 | benjamin.peterson | 2009-02-26 13:05:59 -0600 (Thu, 26 Feb 2009) | 1 line
comma
........
r70002 | andrew.kuchling | 2009-02-26 16:34:30 -0600 (Thu, 26 Feb 2009) | 1 line
The curses panel library is now supported
........
r70022 | georg.brandl | 2009-02-27 10:23:18 -0600 (Fri, 27 Feb 2009) | 1 line
#5361: fix typo.
........
r70023 | georg.brandl | 2009-02-27 10:39:26 -0600 (Fri, 27 Feb 2009) | 1 line
#5363: fix cmpfiles() docs. Another instance where a prose description is twice as long as the code.
........
r70025 | georg.brandl | 2009-02-27 10:52:55 -0600 (Fri, 27 Feb 2009) | 1 line
#5344: fix punctuation.
........
r70026 | georg.brandl | 2009-02-27 10:59:03 -0600 (Fri, 27 Feb 2009) | 1 line
#5365: add quick look conversion table for different time representations.
........
r70061 | hirokazu.yamamoto | 2009-02-28 09:24:00 -0600 (Sat, 28 Feb 2009) | 1 line
Binary flag is needed on windows.
........
r70086 | benjamin.peterson | 2009-03-01 21:35:12 -0600 (Sun, 01 Mar 2009) | 1 line
fix a silly problem of caching gone wrong #5401
........
r70145 | benjamin.peterson | 2009-03-03 16:51:57 -0600 (Tue, 03 Mar 2009) | 1 line
making the writing more formal
........
r70171 | facundo.batista | 2009-03-04 15:18:17 -0600 (Wed, 04 Mar 2009) | 3 lines
Fixed a typo.
........
r70183 | benjamin.peterson | 2009-03-04 18:17:57 -0600 (Wed, 04 Mar 2009) | 1 line
add example
........
r70188 | hirokazu.yamamoto | 2009-03-05 03:34:14 -0600 (Thu, 05 Mar 2009) | 1 line
Fixed memory leak on failure.
........
r70235 | benjamin.peterson | 2009-03-07 18:21:17 -0600 (Sat, 07 Mar 2009) | 1 line
fix funky indentation
........
r70244 | martin.v.loewis | 2009-03-08 09:06:19 -0500 (Sun, 08 Mar 2009) | 2 lines
Add Chris Withers.
........
r70275 | georg.brandl | 2009-03-09 11:35:48 -0500 (Mon, 09 Mar 2009) | 2 lines
Add missing space.
........
r70281 | benjamin.peterson | 2009-03-09 15:38:56 -0500 (Mon, 09 Mar 2009) | 1 line
gzip and bz2 are context managers
........
2009-03-09 18:04:33 -03:00
|
|
|
if (self->ob_exports > 0) {
|
|
|
|
PyErr_SetString(PyExc_SystemError,
|
Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70980 | jack.diederich | 2009-04-01 15:26:13 -0500 (Wed, 01 Apr 2009) | 3 lines
bounds check arguments to mmap.move(). All of them. Really.
fixes crasher on OS X 10.5
........
r71059 | mark.dickinson | 2009-04-02 13:39:37 -0500 (Thu, 02 Apr 2009) | 2 lines
sys.long_info attributes should be ints, not longs
........
r71225 | georg.brandl | 2009-04-05 06:54:07 -0500 (Sun, 05 Apr 2009) | 1 line
#5580: no need to use parentheses when converterr() argument is actually a type description.
........
r71234 | georg.brandl | 2009-04-05 08:16:35 -0500 (Sun, 05 Apr 2009) | 1 line
Whitespace normalization.
........
r71241 | georg.brandl | 2009-04-05 09:48:49 -0500 (Sun, 05 Apr 2009) | 1 line
#5471: fix expanduser() for $HOME set to "/".
........
r71243 | georg.brandl | 2009-04-05 10:14:29 -0500 (Sun, 05 Apr 2009) | 1 line
#5432: make plistlib docstring a raw string, since it contains examples with backslash escapes.
........
r71249 | georg.brandl | 2009-04-05 11:30:43 -0500 (Sun, 05 Apr 2009) | 1 line
#5444: adapt make.bat to new htmlhelp output file name.
........
r71251 | georg.brandl | 2009-04-05 12:17:42 -0500 (Sun, 05 Apr 2009) | 1 line
#5298: clarify docs about GIL by using more consistent wording.
........
r71255 | georg.brandl | 2009-04-05 13:34:58 -0500 (Sun, 05 Apr 2009) | 1 line
#602893: add indicator for current line in cgitb that doesnt rely on styling alone.
........
r71266 | georg.brandl | 2009-04-05 15:23:13 -0500 (Sun, 05 Apr 2009) | 1 line
Normalize issue referencing style.
........
r71299 | gregory.p.smith | 2009-04-05 18:43:58 -0500 (Sun, 05 Apr 2009) | 3 lines
Fixes issue5705: os.setuid() and friends did not accept the same range of
values that pwd.getpwnam() returns.
........
r71329 | benjamin.peterson | 2009-04-06 16:53:33 -0500 (Mon, 06 Apr 2009) | 1 line
add create_connection to __all__ #5711
........
r71397 | georg.brandl | 2009-04-08 11:36:39 -0500 (Wed, 08 Apr 2009) | 1 line
Remove redundant backtick.
........
r71398 | georg.brandl | 2009-04-08 11:39:04 -0500 (Wed, 08 Apr 2009) | 1 line
Update ignore file for suspicious builder.
........
r71486 | andrew.kuchling | 2009-04-11 11:18:14 -0500 (Sat, 11 Apr 2009) | 1 line
Re-word
........
2009-04-11 16:48:14 -03:00
|
|
|
"deallocated bytearray object has exported buffers");
|
Merged revisions 69998-69999,70002,70022-70023,70025-70026,70061,70086,70145,70171,70183,70188,70235,70244,70275,70281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69998 | benjamin.peterson | 2009-02-26 13:04:40 -0600 (Thu, 26 Feb 2009) | 1 line
the startship is rather outdated now
........
r69999 | benjamin.peterson | 2009-02-26 13:05:59 -0600 (Thu, 26 Feb 2009) | 1 line
comma
........
r70002 | andrew.kuchling | 2009-02-26 16:34:30 -0600 (Thu, 26 Feb 2009) | 1 line
The curses panel library is now supported
........
r70022 | georg.brandl | 2009-02-27 10:23:18 -0600 (Fri, 27 Feb 2009) | 1 line
#5361: fix typo.
........
r70023 | georg.brandl | 2009-02-27 10:39:26 -0600 (Fri, 27 Feb 2009) | 1 line
#5363: fix cmpfiles() docs. Another instance where a prose description is twice as long as the code.
........
r70025 | georg.brandl | 2009-02-27 10:52:55 -0600 (Fri, 27 Feb 2009) | 1 line
#5344: fix punctuation.
........
r70026 | georg.brandl | 2009-02-27 10:59:03 -0600 (Fri, 27 Feb 2009) | 1 line
#5365: add quick look conversion table for different time representations.
........
r70061 | hirokazu.yamamoto | 2009-02-28 09:24:00 -0600 (Sat, 28 Feb 2009) | 1 line
Binary flag is needed on windows.
........
r70086 | benjamin.peterson | 2009-03-01 21:35:12 -0600 (Sun, 01 Mar 2009) | 1 line
fix a silly problem of caching gone wrong #5401
........
r70145 | benjamin.peterson | 2009-03-03 16:51:57 -0600 (Tue, 03 Mar 2009) | 1 line
making the writing more formal
........
r70171 | facundo.batista | 2009-03-04 15:18:17 -0600 (Wed, 04 Mar 2009) | 3 lines
Fixed a typo.
........
r70183 | benjamin.peterson | 2009-03-04 18:17:57 -0600 (Wed, 04 Mar 2009) | 1 line
add example
........
r70188 | hirokazu.yamamoto | 2009-03-05 03:34:14 -0600 (Thu, 05 Mar 2009) | 1 line
Fixed memory leak on failure.
........
r70235 | benjamin.peterson | 2009-03-07 18:21:17 -0600 (Sat, 07 Mar 2009) | 1 line
fix funky indentation
........
r70244 | martin.v.loewis | 2009-03-08 09:06:19 -0500 (Sun, 08 Mar 2009) | 2 lines
Add Chris Withers.
........
r70275 | georg.brandl | 2009-03-09 11:35:48 -0500 (Mon, 09 Mar 2009) | 2 lines
Add missing space.
........
r70281 | benjamin.peterson | 2009-03-09 15:38:56 -0500 (Mon, 09 Mar 2009) | 1 line
gzip and bz2 are context managers
........
2009-03-09 18:04:33 -03:00
|
|
|
PyErr_Print();
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
if (self->ob_bytes != 0) {
|
2011-11-12 16:15:28 -04:00
|
|
|
PyObject_Free(self->ob_bytes);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
Py_TYPE(self)->tp_free((PyObject *)self);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
|
|
/* Methods */
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
#define FASTSEARCH fastsearch
|
|
|
|
#define STRINGLIB(F) stringlib_##F
|
2008-05-26 10:42:13 -03:00
|
|
|
#define STRINGLIB_CHAR char
|
2012-10-16 16:07:23 -03:00
|
|
|
#define STRINGLIB_SIZEOF_CHAR 1
|
2008-05-26 10:42:13 -03:00
|
|
|
#define STRINGLIB_LEN PyByteArray_GET_SIZE
|
|
|
|
#define STRINGLIB_STR PyByteArray_AS_STRING
|
|
|
|
#define STRINGLIB_NEW PyByteArray_FromStringAndSize
|
2010-01-13 04:07:53 -04:00
|
|
|
#define STRINGLIB_ISSPACE Py_ISSPACE
|
|
|
|
#define STRINGLIB_ISLINEBREAK(x) ((x == '\n') || (x == '\r'))
|
2008-05-26 10:42:13 -03:00
|
|
|
#define STRINGLIB_CHECK_EXACT PyByteArray_CheckExact
|
|
|
|
#define STRINGLIB_MUTABLE 1
|
|
|
|
|
|
|
|
#include "stringlib/fastsearch.h"
|
|
|
|
#include "stringlib/count.h"
|
|
|
|
#include "stringlib/find.h"
|
2012-10-16 16:07:23 -03:00
|
|
|
#include "stringlib/join.h"
|
2008-05-26 10:42:13 -03:00
|
|
|
#include "stringlib/partition.h"
|
2010-01-13 04:07:53 -04:00
|
|
|
#include "stringlib/split.h"
|
2008-05-26 10:42:13 -03:00
|
|
|
#include "stringlib/ctype.h"
|
|
|
|
#include "stringlib/transmogrify.h"
|
|
|
|
|
|
|
|
|
2016-07-03 07:57:48 -03:00
|
|
|
static PyObject *
|
|
|
|
bytearray_find(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_find(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_count(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_count(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.clear
|
|
|
|
|
|
|
|
Remove all items from the bytearray.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2011-09-28 23:02:13 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_clear_impl(PyByteArrayObject *self)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=85c2fe6aede0956c input=ed6edae9de447ac4]*/
|
2011-03-03 14:21:02 -04:00
|
|
|
{
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, 0) < 0)
|
|
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.copy
|
|
|
|
|
|
|
|
Return a copy of B.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2011-03-03 14:21:02 -04:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_copy_impl(PyByteArrayObject *self)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=68cfbcfed484c132 input=6597b0c01bccaa9e]*/
|
2011-03-03 14:21:02 -04:00
|
|
|
{
|
|
|
|
return PyByteArray_FromStringAndSize(PyByteArray_AS_STRING((PyObject *)self),
|
|
|
|
PyByteArray_GET_SIZE(self));
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2016-07-03 07:57:48 -03:00
|
|
|
static PyObject *
|
|
|
|
bytearray_index(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_index(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_rfind(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_rfind(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_rindex(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_rindex(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
bytearray_contains(PyObject *self, PyObject *arg)
|
|
|
|
{
|
|
|
|
return _Py_bytes_contains(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_startswith(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_startswith(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_endswith(PyByteArrayObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
return _Py_bytes_endswith(PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self), args);
|
|
|
|
}
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.translate
|
|
|
|
|
|
|
|
table: object
|
|
|
|
Translation table, which must be a bytes object of length 256.
|
|
|
|
/
|
2016-08-27 05:35:02 -03:00
|
|
|
delete as deletechars: object(c_default="NULL") = b''
|
2014-07-27 11:25:09 -03:00
|
|
|
|
|
|
|
Return a copy with each character mapped by the given translation table.
|
|
|
|
|
2016-08-27 05:35:02 -03:00
|
|
|
All characters occurring in the optional argument delete are removed.
|
2014-07-27 11:25:09 -03:00
|
|
|
The remaining characters are mapped through the given translation table.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2015-04-14 19:07:59 -03:00
|
|
|
bytearray_translate_impl(PyByteArrayObject *self, PyObject *table,
|
2016-08-27 05:35:02 -03:00
|
|
|
PyObject *deletechars)
|
|
|
|
/*[clinic end generated code: output=b6a8f01c2a74e446 input=cfff956d4d127a9b]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2013-08-13 15:18:52 -03:00
|
|
|
char *input, *output;
|
2014-07-27 11:25:09 -03:00
|
|
|
const char *table_chars;
|
2013-08-13 15:18:52 -03:00
|
|
|
Py_ssize_t i, c;
|
2008-05-26 10:42:13 -03:00
|
|
|
PyObject *input_obj = (PyObject*)self;
|
|
|
|
const char *output_start;
|
|
|
|
Py_ssize_t inlen;
|
2008-12-28 07:44:14 -04:00
|
|
|
PyObject *result = NULL;
|
2008-05-26 10:42:13 -03:00
|
|
|
int trans_table[256];
|
|
|
|
Py_buffer vtable, vdel;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (table == Py_None) {
|
|
|
|
table_chars = NULL;
|
2008-12-28 07:44:14 -04:00
|
|
|
table = NULL;
|
2015-02-02 19:25:42 -04:00
|
|
|
} else if (PyObject_GetBuffer(table, &vtable, PyBUF_SIMPLE) != 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2008-12-28 07:44:14 -04:00
|
|
|
} else {
|
|
|
|
if (vtable.len != 256) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"translation table must be 256 characters long");
|
2009-07-22 09:03:59 -03:00
|
|
|
PyBuffer_Release(&vtable);
|
|
|
|
return NULL;
|
2008-12-28 07:44:14 -04:00
|
|
|
}
|
2014-07-27 11:25:09 -03:00
|
|
|
table_chars = (const char*)vtable.buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (deletechars != NULL) {
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(deletechars, &vdel, PyBUF_SIMPLE) != 0) {
|
2014-07-27 11:25:09 -03:00
|
|
|
if (table != NULL)
|
2009-07-22 09:03:59 -03:00
|
|
|
PyBuffer_Release(&vtable);
|
|
|
|
return NULL;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vdel.buf = NULL;
|
|
|
|
vdel.len = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
inlen = PyByteArray_GET_SIZE(input_obj);
|
|
|
|
result = PyByteArray_FromStringAndSize((char *)NULL, inlen);
|
|
|
|
if (result == NULL)
|
|
|
|
goto done;
|
2016-05-04 16:23:26 -03:00
|
|
|
output_start = output = PyByteArray_AS_STRING(result);
|
2008-05-26 10:42:13 -03:00
|
|
|
input = PyByteArray_AS_STRING(input_obj);
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (vdel.len == 0 && table_chars != NULL) {
|
2008-05-26 10:42:13 -03:00
|
|
|
/* If no deletions are required, use faster code */
|
|
|
|
for (i = inlen; --i >= 0; ) {
|
|
|
|
c = Py_CHARMASK(*input++);
|
2014-07-27 11:25:09 -03:00
|
|
|
*output++ = table_chars[c];
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
goto done;
|
|
|
|
}
|
2008-12-28 07:44:14 -04:00
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (table_chars == NULL) {
|
2008-12-28 07:44:14 -04:00
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
trans_table[i] = Py_CHARMASK(i);
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < 256; i++)
|
2014-07-27 11:25:09 -03:00
|
|
|
trans_table[i] = Py_CHARMASK(table_chars[i]);
|
2008-12-28 07:44:14 -04:00
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
for (i = 0; i < vdel.len; i++)
|
|
|
|
trans_table[(int) Py_CHARMASK( ((unsigned char*)vdel.buf)[i] )] = -1;
|
|
|
|
|
|
|
|
for (i = inlen; --i >= 0; ) {
|
|
|
|
c = Py_CHARMASK(*input++);
|
|
|
|
if (trans_table[c] != -1)
|
2016-08-27 05:35:02 -03:00
|
|
|
*output++ = (char)trans_table[c];
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
/* Fix the size of the resulting string */
|
|
|
|
if (inlen > 0)
|
2013-07-20 21:04:35 -03:00
|
|
|
if (PyByteArray_Resize(result, output - output_start) < 0) {
|
|
|
|
Py_CLEAR(result);
|
|
|
|
goto done;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
done:
|
2014-07-27 11:25:09 -03:00
|
|
|
if (table != NULL)
|
2008-12-28 07:44:14 -04:00
|
|
|
PyBuffer_Release(&vtable);
|
2014-07-27 11:25:09 -03:00
|
|
|
if (deletechars != NULL)
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vdel);
|
2008-05-26 10:42:13 -03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
bytearray.maketrans
|
|
|
|
|
2015-02-02 19:25:42 -04:00
|
|
|
frm: Py_buffer
|
|
|
|
to: Py_buffer
|
2014-07-27 11:25:09 -03:00
|
|
|
/
|
|
|
|
|
|
|
|
Return a translation table useable for the bytes or bytearray translate method.
|
|
|
|
|
|
|
|
The returned table will be one where each byte in frm is mapped to the byte at
|
|
|
|
the same position in to.
|
|
|
|
|
|
|
|
The bytes objects frm and to must be of the same length.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2009-04-12 12:51:51 -03:00
|
|
|
static PyObject *
|
2015-02-02 19:25:42 -04:00
|
|
|
bytearray_maketrans_impl(Py_buffer *frm, Py_buffer *to)
|
2015-04-03 17:53:51 -03:00
|
|
|
/*[clinic end generated code: output=1df267d99f56b15e input=5925a81d2fbbf151]*/
|
2009-04-12 12:51:51 -03:00
|
|
|
{
|
2014-07-27 11:25:09 -03:00
|
|
|
return _Py_bytes_maketrans(frm, to);
|
2009-04-12 12:51:51 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.replace
|
|
|
|
|
2015-02-02 19:25:42 -04:00
|
|
|
old: Py_buffer
|
|
|
|
new: Py_buffer
|
2014-07-27 11:25:09 -03:00
|
|
|
count: Py_ssize_t = -1
|
|
|
|
Maximum number of occurrences to replace.
|
|
|
|
-1 (the default value) means replace all occurrences.
|
|
|
|
/
|
|
|
|
|
|
|
|
Return a copy with all occurrences of substring old replaced by new.
|
|
|
|
|
|
|
|
If the optional argument count is given, only the first count occurrences are
|
|
|
|
replaced.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2015-04-14 19:07:59 -03:00
|
|
|
bytearray_replace_impl(PyByteArrayObject *self, Py_buffer *old,
|
|
|
|
Py_buffer *new, Py_ssize_t count)
|
|
|
|
/*[clinic end generated code: output=d39884c4dc59412a input=aa379d988637c7fb]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
2016-05-05 03:26:07 -03:00
|
|
|
return stringlib_replace((PyObject *)self,
|
2016-07-03 07:57:48 -03:00
|
|
|
(const char *)old->buf, old->len,
|
|
|
|
(const char *)new->buf, new->len, count);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.split
|
|
|
|
|
|
|
|
sep: object = None
|
|
|
|
The delimiter according which to split the bytearray.
|
|
|
|
None (the default value) means split on ASCII whitespace characters
|
|
|
|
(space, tab, return, newline, formfeed, vertical tab).
|
|
|
|
maxsplit: Py_ssize_t = -1
|
|
|
|
Maximum number of splits to do.
|
|
|
|
-1 (the default value) means no limit.
|
|
|
|
|
|
|
|
Return a list of the sections in the bytearray, using sep as the delimiter.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2015-04-14 19:07:59 -03:00
|
|
|
bytearray_split_impl(PyByteArrayObject *self, PyObject *sep,
|
|
|
|
Py_ssize_t maxsplit)
|
|
|
|
/*[clinic end generated code: output=833e2cf385d9a04d input=24f82669f41bf523]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t len = PyByteArray_GET_SIZE(self), n;
|
2008-05-26 10:42:13 -03:00
|
|
|
const char *s = PyByteArray_AS_STRING(self), *sub;
|
2014-07-27 11:25:09 -03:00
|
|
|
PyObject *list;
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_buffer vsub;
|
|
|
|
|
|
|
|
if (maxsplit < 0)
|
|
|
|
maxsplit = PY_SSIZE_T_MAX;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (sep == Py_None)
|
2010-01-13 04:07:53 -04:00
|
|
|
return stringlib_split_whitespace((PyObject*) self, s, len, maxsplit);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(sep, &vsub, PyBUF_SIMPLE) != 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
sub = vsub.buf;
|
|
|
|
n = vsub.len;
|
|
|
|
|
2010-01-13 04:07:53 -04:00
|
|
|
list = stringlib_split(
|
|
|
|
(PyObject*) self, s, len, sub, n, maxsplit
|
|
|
|
);
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vsub);
|
2008-05-26 10:42:13 -03:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.partition
|
|
|
|
|
|
|
|
sep: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Partition the bytearray into three parts using the given separator.
|
|
|
|
|
|
|
|
This will search for the separator sep in the bytearray. If the separator is
|
|
|
|
found, returns a 3-tuple containing the part before the separator, the
|
|
|
|
separator itself, and the part after it.
|
|
|
|
|
|
|
|
If the separator is not found, returns a 3-tuple containing the original
|
|
|
|
bytearray object and two empty bytearray objects.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_partition(PyByteArrayObject *self, PyObject *sep)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=45d2525ddd35f957 input=86f89223892b70b5]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
PyObject *bytesep, *result;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
bytesep = PyByteArray_FromObject(sep);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (! bytesep)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result = stringlib_partition(
|
|
|
|
(PyObject*) self,
|
|
|
|
PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self),
|
|
|
|
bytesep,
|
|
|
|
PyByteArray_AS_STRING(bytesep), PyByteArray_GET_SIZE(bytesep)
|
|
|
|
);
|
|
|
|
|
|
|
|
Py_DECREF(bytesep);
|
2010-01-13 04:07:53 -04:00
|
|
|
return result;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.rpartition
|
|
|
|
|
|
|
|
sep: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Partition the bytes into three parts using the given separator.
|
|
|
|
|
|
|
|
This will search for the separator sep in the bytearray, starting and the end.
|
|
|
|
If the separator is found, returns a 3-tuple containing the part before the
|
|
|
|
separator, the separator itself, and the part after it.
|
|
|
|
|
|
|
|
If the separator is not found, returns a 3-tuple containing two empty bytearray
|
|
|
|
objects and the original bytearray object.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_rpartition(PyByteArrayObject *self, PyObject *sep)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=440de3c9426115e8 input=5f4094f2de87c8f3]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
PyObject *bytesep, *result;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
bytesep = PyByteArray_FromObject(sep);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (! bytesep)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result = stringlib_rpartition(
|
|
|
|
(PyObject*) self,
|
|
|
|
PyByteArray_AS_STRING(self), PyByteArray_GET_SIZE(self),
|
|
|
|
bytesep,
|
|
|
|
PyByteArray_AS_STRING(bytesep), PyByteArray_GET_SIZE(bytesep)
|
|
|
|
);
|
|
|
|
|
|
|
|
Py_DECREF(bytesep);
|
2010-01-13 04:07:53 -04:00
|
|
|
return result;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.rsplit = bytearray.split
|
|
|
|
|
|
|
|
Return a list of the sections in the bytearray, using sep as the delimiter.
|
|
|
|
|
|
|
|
Splitting is done starting at the end of the bytearray and working to the front.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2015-04-14 19:07:59 -03:00
|
|
|
bytearray_rsplit_impl(PyByteArrayObject *self, PyObject *sep,
|
|
|
|
Py_ssize_t maxsplit)
|
|
|
|
/*[clinic end generated code: output=a55e0b5a03cb6190 input=a68286e4dd692ffe]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t len = PyByteArray_GET_SIZE(self), n;
|
2008-05-26 10:42:13 -03:00
|
|
|
const char *s = PyByteArray_AS_STRING(self), *sub;
|
2014-07-27 11:25:09 -03:00
|
|
|
PyObject *list;
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_buffer vsub;
|
|
|
|
|
|
|
|
if (maxsplit < 0)
|
|
|
|
maxsplit = PY_SSIZE_T_MAX;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (sep == Py_None)
|
2010-01-13 04:07:53 -04:00
|
|
|
return stringlib_rsplit_whitespace((PyObject*) self, s, len, maxsplit);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(sep, &vsub, PyBUF_SIMPLE) != 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
sub = vsub.buf;
|
|
|
|
n = vsub.len;
|
|
|
|
|
2010-01-13 04:07:53 -04:00
|
|
|
list = stringlib_rsplit(
|
|
|
|
(PyObject*) self, s, len, sub, n, maxsplit
|
|
|
|
);
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&vsub);
|
2008-05-26 10:42:13 -03:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.reverse
|
|
|
|
|
|
|
|
Reverse the order of the values in B in place.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_reverse_impl(PyByteArrayObject *self)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=9f7616f29ab309d3 input=543356319fc78557]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
char swap, *head, *tail;
|
|
|
|
Py_ssize_t i, j, n = Py_SIZE(self);
|
|
|
|
|
|
|
|
j = n / 2;
|
2013-10-05 16:12:18 -03:00
|
|
|
head = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
tail = head + n - 1;
|
|
|
|
for (i = 0; i < j; i++) {
|
|
|
|
swap = *head;
|
|
|
|
*head++ = *tail;
|
|
|
|
*tail-- = swap;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
|
|
|
|
/*[python input]
|
|
|
|
class bytesvalue_converter(CConverter):
|
|
|
|
type = 'int'
|
|
|
|
converter = '_getbytevalue'
|
|
|
|
[python start generated code]*/
|
|
|
|
/*[python end generated code: output=da39a3ee5e6b4b0d input=29c2e7c26c212812]*/
|
|
|
|
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
bytearray.insert
|
|
|
|
|
|
|
|
index: Py_ssize_t
|
|
|
|
The index where the value is to be inserted.
|
|
|
|
item: bytesvalue
|
|
|
|
The item to be inserted.
|
|
|
|
/
|
|
|
|
|
|
|
|
Insert a single item into the bytearray before the given index.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_insert_impl(PyByteArrayObject *self, Py_ssize_t index, int item)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=76c775a70e7b07b7 input=b2b5d07e9de6c070]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t n = Py_SIZE(self);
|
|
|
|
char *buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (n == PY_SSIZE_T_MAX) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
2009-09-06 07:34:47 -03:00
|
|
|
"cannot add more objects to bytearray");
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, n + 1) < 0)
|
|
|
|
return NULL;
|
2013-10-05 16:12:18 -03:00
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
if (index < 0) {
|
|
|
|
index += n;
|
|
|
|
if (index < 0)
|
|
|
|
index = 0;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2014-07-27 11:25:09 -03:00
|
|
|
if (index > n)
|
|
|
|
index = n;
|
|
|
|
memmove(buf + index + 1, buf + index, n - index);
|
|
|
|
buf[index] = item;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.append
|
|
|
|
|
|
|
|
item: bytesvalue
|
|
|
|
The item to be appended.
|
|
|
|
/
|
|
|
|
|
|
|
|
Append a single item to the end of the bytearray.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_append_impl(PyByteArrayObject *self, int item)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=a154e19ed1886cb6 input=20d6bec3d1340593]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t n = Py_SIZE(self);
|
|
|
|
|
|
|
|
if (n == PY_SSIZE_T_MAX) {
|
|
|
|
PyErr_SetString(PyExc_OverflowError,
|
2009-09-06 07:34:47 -03:00
|
|
|
"cannot add more objects to bytearray");
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (PyByteArray_Resize((PyObject *)self, n + 1) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
PyByteArray_AS_STRING(self)[n] = item;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.extend
|
|
|
|
|
|
|
|
iterable_of_ints: object
|
|
|
|
The iterable of items to append.
|
|
|
|
/
|
|
|
|
|
|
|
|
Append all the items from the iterator or sequence to the end of the bytearray.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_extend(PyByteArrayObject *self, PyObject *iterable_of_ints)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=98155dbe249170b1 input=c617b3a93249ba28]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2009-04-18 12:42:12 -03:00
|
|
|
PyObject *it, *item, *bytearray_obj;
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_ssize_t buf_size = 0, len = 0;
|
|
|
|
int value;
|
|
|
|
char *buf;
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
/* bytearray_setslice code only accepts something supporting PEP 3118. */
|
2014-07-27 11:25:09 -03:00
|
|
|
if (PyObject_CheckBuffer(iterable_of_ints)) {
|
|
|
|
if (bytearray_setslice(self, Py_SIZE(self), Py_SIZE(self), iterable_of_ints) == -1)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
it = PyObject_GetIter(iterable_of_ints);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2011-03-15 00:18:48 -03:00
|
|
|
/* Try to determine the length of the argument. 32 is arbitrary. */
|
2014-07-27 11:25:09 -03:00
|
|
|
buf_size = PyObject_LengthHint(iterable_of_ints, 32);
|
Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70980 | jack.diederich | 2009-04-01 15:26:13 -0500 (Wed, 01 Apr 2009) | 3 lines
bounds check arguments to mmap.move(). All of them. Really.
fixes crasher on OS X 10.5
........
r71059 | mark.dickinson | 2009-04-02 13:39:37 -0500 (Thu, 02 Apr 2009) | 2 lines
sys.long_info attributes should be ints, not longs
........
r71225 | georg.brandl | 2009-04-05 06:54:07 -0500 (Sun, 05 Apr 2009) | 1 line
#5580: no need to use parentheses when converterr() argument is actually a type description.
........
r71234 | georg.brandl | 2009-04-05 08:16:35 -0500 (Sun, 05 Apr 2009) | 1 line
Whitespace normalization.
........
r71241 | georg.brandl | 2009-04-05 09:48:49 -0500 (Sun, 05 Apr 2009) | 1 line
#5471: fix expanduser() for $HOME set to "/".
........
r71243 | georg.brandl | 2009-04-05 10:14:29 -0500 (Sun, 05 Apr 2009) | 1 line
#5432: make plistlib docstring a raw string, since it contains examples with backslash escapes.
........
r71249 | georg.brandl | 2009-04-05 11:30:43 -0500 (Sun, 05 Apr 2009) | 1 line
#5444: adapt make.bat to new htmlhelp output file name.
........
r71251 | georg.brandl | 2009-04-05 12:17:42 -0500 (Sun, 05 Apr 2009) | 1 line
#5298: clarify docs about GIL by using more consistent wording.
........
r71255 | georg.brandl | 2009-04-05 13:34:58 -0500 (Sun, 05 Apr 2009) | 1 line
#602893: add indicator for current line in cgitb that doesnt rely on styling alone.
........
r71266 | georg.brandl | 2009-04-05 15:23:13 -0500 (Sun, 05 Apr 2009) | 1 line
Normalize issue referencing style.
........
r71299 | gregory.p.smith | 2009-04-05 18:43:58 -0500 (Sun, 05 Apr 2009) | 3 lines
Fixes issue5705: os.setuid() and friends did not accept the same range of
values that pwd.getpwnam() returns.
........
r71329 | benjamin.peterson | 2009-04-06 16:53:33 -0500 (Mon, 06 Apr 2009) | 1 line
add create_connection to __all__ #5711
........
r71397 | georg.brandl | 2009-04-08 11:36:39 -0500 (Wed, 08 Apr 2009) | 1 line
Remove redundant backtick.
........
r71398 | georg.brandl | 2009-04-08 11:39:04 -0500 (Wed, 08 Apr 2009) | 1 line
Update ignore file for suspicious builder.
........
r71486 | andrew.kuchling | 2009-04-11 11:18:14 -0500 (Sat, 11 Apr 2009) | 1 line
Re-word
........
2009-04-11 16:48:14 -03:00
|
|
|
if (buf_size == -1) {
|
|
|
|
Py_DECREF(it);
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_obj = PyByteArray_FromStringAndSize(NULL, buf_size);
|
2012-04-01 11:05:46 -03:00
|
|
|
if (bytearray_obj == NULL) {
|
|
|
|
Py_DECREF(it);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2012-04-01 11:05:46 -03:00
|
|
|
}
|
2009-04-18 12:42:12 -03:00
|
|
|
buf = PyByteArray_AS_STRING(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
|
|
|
if (! _getbytevalue(item, &value)) {
|
|
|
|
Py_DECREF(item);
|
|
|
|
Py_DECREF(it);
|
2009-04-18 12:42:12 -03:00
|
|
|
Py_DECREF(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
buf[len++] = value;
|
|
|
|
Py_DECREF(item);
|
|
|
|
|
|
|
|
if (len >= buf_size) {
|
2016-07-18 04:53:13 -03:00
|
|
|
Py_ssize_t addition;
|
|
|
|
if (len == PY_SSIZE_T_MAX) {
|
|
|
|
Py_DECREF(it);
|
|
|
|
Py_DECREF(bytearray_obj);
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
|
|
|
addition = len >> 1;
|
|
|
|
if (addition > PY_SSIZE_T_MAX - len - 1)
|
|
|
|
buf_size = PY_SSIZE_T_MAX;
|
|
|
|
else
|
|
|
|
buf_size = len + addition + 1;
|
2009-04-18 12:42:12 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)bytearray_obj, buf_size) < 0) {
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_DECREF(it);
|
2009-04-18 12:42:12 -03:00
|
|
|
Py_DECREF(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Recompute the `buf' pointer, since the resizing operation may
|
|
|
|
have invalidated it. */
|
2009-04-18 12:42:12 -03:00
|
|
|
buf = PyByteArray_AS_STRING(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_DECREF(it);
|
|
|
|
|
|
|
|
/* Resize down to exact size. */
|
2009-04-18 12:42:12 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)bytearray_obj, len) < 0) {
|
|
|
|
Py_DECREF(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-04-01 11:05:46 -03:00
|
|
|
if (bytearray_setslice(self, Py_SIZE(self), Py_SIZE(self), bytearray_obj) == -1) {
|
|
|
|
Py_DECREF(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2012-04-01 11:05:46 -03:00
|
|
|
}
|
2009-04-18 12:42:12 -03:00
|
|
|
Py_DECREF(bytearray_obj);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.pop
|
|
|
|
|
|
|
|
index: Py_ssize_t = -1
|
|
|
|
The index from where to remove the item.
|
|
|
|
-1 (the default value) means remove the last item.
|
|
|
|
/
|
|
|
|
|
|
|
|
Remove and return a single item from B.
|
|
|
|
|
|
|
|
If no index argument is given, will pop the last item.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_pop_impl(PyByteArrayObject *self, Py_ssize_t index)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=e0ccd401f8021da8 input=3591df2d06c0d237]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
int value;
|
2014-07-27 11:25:09 -03:00
|
|
|
Py_ssize_t n = Py_SIZE(self);
|
2013-10-05 16:12:18 -03:00
|
|
|
char *buf;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
if (n == 0) {
|
2011-03-04 00:55:25 -04:00
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"pop from empty bytearray");
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2014-07-27 11:25:09 -03:00
|
|
|
if (index < 0)
|
|
|
|
index += Py_SIZE(self);
|
|
|
|
if (index < 0 || index >= Py_SIZE(self)) {
|
2008-05-26 10:42:13 -03:00
|
|
|
PyErr_SetString(PyExc_IndexError, "pop index out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-12-06 17:27:53 -04:00
|
|
|
if (!_canresize(self))
|
|
|
|
return NULL;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2014-07-27 11:25:09 -03:00
|
|
|
value = buf[index];
|
|
|
|
memmove(buf + index, buf + index + 1, n - index);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)self, n - 1) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2009-09-06 07:19:23 -03:00
|
|
|
return PyLong_FromLong((unsigned char)value);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.remove
|
|
|
|
|
|
|
|
value: bytesvalue
|
|
|
|
The value to remove.
|
|
|
|
/
|
|
|
|
|
|
|
|
Remove the first occurrence of a value in the bytearray.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_remove_impl(PyByteArrayObject *self, int value)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=d659e37866709c13 input=121831240cd51ddf]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_ssize_t where, n = Py_SIZE(self);
|
2013-10-05 16:12:18 -03:00
|
|
|
char *buf = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2016-05-16 16:24:03 -03:00
|
|
|
where = stringlib_find_char(buf, n, value);
|
|
|
|
if (where < 0) {
|
2009-09-06 07:34:47 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2008-12-06 17:27:53 -04:00
|
|
|
if (!_canresize(self))
|
|
|
|
return NULL;
|
2008-05-26 10:42:13 -03:00
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
memmove(buf + where, buf + where + 1, n - where);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (PyByteArray_Resize((PyObject *)self, n - 1) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX These two helpers could be optimized if argsize == 1 */
|
|
|
|
|
|
|
|
static Py_ssize_t
|
2015-12-25 14:01:53 -04:00
|
|
|
lstrip_helper(const char *myptr, Py_ssize_t mysize,
|
|
|
|
const void *argptr, Py_ssize_t argsize)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t i = 0;
|
2013-10-05 16:24:10 -03:00
|
|
|
while (i < mysize && memchr(argptr, (unsigned char) myptr[i], argsize))
|
2008-05-26 10:42:13 -03:00
|
|
|
i++;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Py_ssize_t
|
2015-12-25 14:01:53 -04:00
|
|
|
rstrip_helper(const char *myptr, Py_ssize_t mysize,
|
|
|
|
const void *argptr, Py_ssize_t argsize)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t i = mysize - 1;
|
2013-10-05 16:24:10 -03:00
|
|
|
while (i >= 0 && memchr(argptr, (unsigned char) myptr[i], argsize))
|
2008-05-26 10:42:13 -03:00
|
|
|
i--;
|
|
|
|
return i + 1;
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.strip
|
|
|
|
|
|
|
|
bytes: object = None
|
|
|
|
/
|
|
|
|
|
|
|
|
Strip leading and trailing bytes contained in the argument.
|
|
|
|
|
|
|
|
If the argument is omitted or None, strip leading and trailing ASCII whitespace.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_strip_impl(PyByteArrayObject *self, PyObject *bytes)
|
2015-04-03 17:53:51 -03:00
|
|
|
/*[clinic end generated code: output=760412661a34ad5a input=ef7bb59b09c21d62]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t left, right, mysize, byteslen;
|
|
|
|
char *myptr, *bytesptr;
|
|
|
|
Py_buffer vbytes;
|
|
|
|
|
|
|
|
if (bytes == Py_None) {
|
|
|
|
bytesptr = "\t\n\r\f\v ";
|
|
|
|
byteslen = 6;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2014-07-27 11:25:09 -03:00
|
|
|
bytesptr = (char *) vbytes.buf;
|
|
|
|
byteslen = vbytes.len;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
myptr = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
mysize = Py_SIZE(self);
|
2014-07-27 11:25:09 -03:00
|
|
|
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (left == mysize)
|
|
|
|
right = left;
|
|
|
|
else
|
2014-07-27 11:25:09 -03:00
|
|
|
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
|
|
|
|
if (bytes != Py_None)
|
|
|
|
PyBuffer_Release(&vbytes);
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyByteArray_FromStringAndSize(myptr + left, right - left);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.lstrip
|
|
|
|
|
|
|
|
bytes: object = None
|
|
|
|
/
|
|
|
|
|
|
|
|
Strip leading bytes contained in the argument.
|
|
|
|
|
|
|
|
If the argument is omitted or None, strip leading ASCII whitespace.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_lstrip_impl(PyByteArrayObject *self, PyObject *bytes)
|
2015-04-03 17:53:51 -03:00
|
|
|
/*[clinic end generated code: output=d005c9d0ab909e66 input=80843f975dd7c480]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t left, right, mysize, byteslen;
|
|
|
|
char *myptr, *bytesptr;
|
|
|
|
Py_buffer vbytes;
|
|
|
|
|
|
|
|
if (bytes == Py_None) {
|
|
|
|
bytesptr = "\t\n\r\f\v ";
|
|
|
|
byteslen = 6;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2014-07-27 11:25:09 -03:00
|
|
|
bytesptr = (char *) vbytes.buf;
|
|
|
|
byteslen = vbytes.len;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
myptr = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
mysize = Py_SIZE(self);
|
2014-07-27 11:25:09 -03:00
|
|
|
left = lstrip_helper(myptr, mysize, bytesptr, byteslen);
|
2008-05-26 10:42:13 -03:00
|
|
|
right = mysize;
|
2014-07-27 11:25:09 -03:00
|
|
|
if (bytes != Py_None)
|
|
|
|
PyBuffer_Release(&vbytes);
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyByteArray_FromStringAndSize(myptr + left, right - left);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.rstrip
|
|
|
|
|
|
|
|
bytes: object = None
|
|
|
|
/
|
|
|
|
|
|
|
|
Strip trailing bytes contained in the argument.
|
|
|
|
|
|
|
|
If the argument is omitted or None, strip trailing ASCII whitespace.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_rstrip_impl(PyByteArrayObject *self, PyObject *bytes)
|
2015-04-03 17:53:51 -03:00
|
|
|
/*[clinic end generated code: output=030e2fbd2f7276bd input=e728b994954cfd91]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t right, mysize, byteslen;
|
|
|
|
char *myptr, *bytesptr;
|
|
|
|
Py_buffer vbytes;
|
|
|
|
|
|
|
|
if (bytes == Py_None) {
|
|
|
|
bytesptr = "\t\n\r\f\v ";
|
|
|
|
byteslen = 6;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
else {
|
2015-02-02 19:25:42 -04:00
|
|
|
if (PyObject_GetBuffer(bytes, &vbytes, PyBUF_SIMPLE) != 0)
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
2014-07-27 11:25:09 -03:00
|
|
|
bytesptr = (char *) vbytes.buf;
|
|
|
|
byteslen = vbytes.len;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
2013-10-05 16:12:18 -03:00
|
|
|
myptr = PyByteArray_AS_STRING(self);
|
2008-05-26 10:42:13 -03:00
|
|
|
mysize = Py_SIZE(self);
|
2014-07-27 11:25:09 -03:00
|
|
|
right = rstrip_helper(myptr, mysize, bytesptr, byteslen);
|
|
|
|
if (bytes != Py_None)
|
|
|
|
PyBuffer_Release(&vbytes);
|
2013-10-05 16:12:18 -03:00
|
|
|
return PyByteArray_FromStringAndSize(myptr, right);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.decode
|
|
|
|
|
|
|
|
encoding: str(c_default="NULL") = 'utf-8'
|
|
|
|
The encoding with which to decode the bytearray.
|
|
|
|
errors: str(c_default="NULL") = 'strict'
|
|
|
|
The error handling scheme to use for the handling of decoding errors.
|
|
|
|
The default is 'strict' meaning that decoding errors raise a
|
|
|
|
UnicodeDecodeError. Other possible values are 'ignore' and 'replace'
|
|
|
|
as well as any other name registered with codecs.register_error that
|
|
|
|
can handle UnicodeDecodeErrors.
|
|
|
|
|
|
|
|
Decode the bytearray using the codec registered for encoding.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
2015-04-14 19:07:59 -03:00
|
|
|
bytearray_decode_impl(PyByteArrayObject *self, const char *encoding,
|
|
|
|
const char *errors)
|
|
|
|
/*[clinic end generated code: output=f57d43f4a00b42c5 input=f28d8f903020257b]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
2008-05-26 10:42:13 -03:00
|
|
|
if (encoding == NULL)
|
|
|
|
encoding = PyUnicode_GetDefaultEncoding();
|
2014-07-27 12:29:17 -03:00
|
|
|
return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(alloc_doc,
|
|
|
|
"B.__alloc__() -> int\n\
|
|
|
|
\n\
|
2008-05-30 05:20:09 -03:00
|
|
|
Return the number of bytes actually allocated.");
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_alloc(PyByteArrayObject *self)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
return PyLong_FromSsize_t(self->ob_alloc);
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.join
|
|
|
|
|
|
|
|
iterable_of_bytes: object
|
|
|
|
/
|
|
|
|
|
|
|
|
Concatenate any number of bytes/bytearray objects.
|
|
|
|
|
|
|
|
The bytearray whose method is called is inserted in between each pair.
|
|
|
|
|
|
|
|
The result is returned as a new bytearray object.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_join(PyByteArrayObject *self, PyObject *iterable_of_bytes)
|
2015-04-03 17:53:51 -03:00
|
|
|
/*[clinic end generated code: output=a8516370bf68ae08 input=aba6b1f9b30fcb8e]*/
|
2012-10-16 16:07:23 -03:00
|
|
|
{
|
2014-07-27 12:29:17 -03:00
|
|
|
return stringlib_bytes_join((PyObject*)self, iterable_of_bytes);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.splitlines
|
|
|
|
|
2015-05-30 05:30:39 -03:00
|
|
|
keepends: int(c_default="0") = False
|
2014-07-27 11:25:09 -03:00
|
|
|
|
|
|
|
Return a list of the lines in the bytearray, breaking at line boundaries.
|
|
|
|
|
|
|
|
Line breaks are not included in the resulting list unless keepends is given and
|
|
|
|
true.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_splitlines_impl(PyByteArrayObject *self, int keepends)
|
2015-05-30 05:30:39 -03:00
|
|
|
/*[clinic end generated code: output=4223c94b895f6ad9 input=8ccade941e5ea0bd]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
2010-01-13 04:07:53 -04:00
|
|
|
return stringlib_splitlines(
|
|
|
|
(PyObject*) self, PyByteArray_AS_STRING(self),
|
|
|
|
PyByteArray_GET_SIZE(self), keepends
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
@classmethod
|
|
|
|
bytearray.fromhex
|
|
|
|
|
|
|
|
string: unicode
|
|
|
|
/
|
|
|
|
|
|
|
|
Create a bytearray object from a string of hexadecimal numbers.
|
|
|
|
|
|
|
|
Spaces between two numbers are accepted.
|
|
|
|
Example: bytearray.fromhex('B9 01EF') -> bytearray(b'\\xb9\\x01\\xef')
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2016-07-01 11:22:31 -03:00
|
|
|
bytearray_fromhex_impl(PyTypeObject *type, PyObject *string)
|
|
|
|
/*[clinic end generated code: output=8f0f0b6d30fb3ba0 input=f033a16d1fb21f48]*/
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2016-07-01 11:22:31 -03:00
|
|
|
PyObject *result = _PyBytes_FromHex(string, type == &PyByteArray_Type);
|
|
|
|
if (type != &PyByteArray_Type && result != NULL) {
|
2016-12-04 17:59:09 -04:00
|
|
|
Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
|
|
|
|
result, NULL));
|
2016-07-01 11:22:31 -03:00
|
|
|
}
|
|
|
|
return result;
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2015-04-25 20:22:26 -03:00
|
|
|
PyDoc_STRVAR(hex__doc__,
|
|
|
|
"B.hex() -> string\n\
|
|
|
|
\n\
|
|
|
|
Create a string of hexadecimal numbers from a bytearray object.\n\
|
|
|
|
Example: bytearray([0xb9, 0x01, 0xef]).hex() -> 'b901ef'.");
|
|
|
|
|
2016-07-03 07:57:48 -03:00
|
|
|
static PyObject *
|
|
|
|
bytearray_hex(PyBytesObject *self)
|
|
|
|
{
|
|
|
|
char* argbuf = PyByteArray_AS_STRING(self);
|
|
|
|
Py_ssize_t arglen = PyByteArray_GET_SIZE(self);
|
|
|
|
return _Py_strhex(argbuf, arglen);
|
|
|
|
}
|
|
|
|
|
2008-05-26 10:42:13 -03:00
|
|
|
static PyObject *
|
2011-12-05 15:40:08 -04:00
|
|
|
_common_reduce(PyByteArrayObject *self, int proto)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
2011-12-05 15:40:08 -04:00
|
|
|
PyObject *dict;
|
2011-10-14 05:20:37 -03:00
|
|
|
_Py_IDENTIFIER(__dict__);
|
2013-10-05 16:12:18 -03:00
|
|
|
char *buf;
|
2011-10-10 13:11:30 -03:00
|
|
|
|
|
|
|
dict = _PyObject_GetAttrId((PyObject *)self, &PyId___dict__);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (dict == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
dict = Py_None;
|
|
|
|
Py_INCREF(dict);
|
|
|
|
}
|
|
|
|
|
2013-10-05 16:12:18 -03:00
|
|
|
buf = PyByteArray_AS_STRING(self);
|
2011-12-05 15:40:08 -04:00
|
|
|
if (proto < 3) {
|
|
|
|
/* use str based reduction for backwards compatibility with Python 2.x */
|
|
|
|
PyObject *latin1;
|
2013-10-05 16:12:18 -03:00
|
|
|
if (Py_SIZE(self))
|
|
|
|
latin1 = PyUnicode_DecodeLatin1(buf, Py_SIZE(self), NULL);
|
2011-12-05 15:40:08 -04:00
|
|
|
else
|
|
|
|
latin1 = PyUnicode_FromString("");
|
|
|
|
return Py_BuildValue("(O(Ns)N)", Py_TYPE(self), latin1, "latin-1", dict);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* use more efficient byte based reduction */
|
2013-10-05 16:12:18 -03:00
|
|
|
if (Py_SIZE(self)) {
|
|
|
|
return Py_BuildValue("(O(y#)N)", Py_TYPE(self), buf, Py_SIZE(self), dict);
|
2011-12-05 15:40:08 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Py_BuildValue("(O()N)", Py_TYPE(self), dict);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.__reduce__ as bytearray_reduce
|
|
|
|
|
|
|
|
Return state information for pickling.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2011-12-05 15:40:08 -04:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_reduce_impl(PyByteArrayObject *self)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=52bf304086464cab input=44b5737ada62dd3f]*/
|
2011-12-05 15:40:08 -04:00
|
|
|
{
|
|
|
|
return _common_reduce(self, 2);
|
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.__reduce_ex__ as bytearray_reduce_ex
|
|
|
|
|
|
|
|
proto: int = 0
|
|
|
|
/
|
|
|
|
|
|
|
|
Return state information for pickling.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearray_reduce_ex_impl(PyByteArrayObject *self, int proto)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=52eac33377197520 input=f129bc1a1aa151ee]*/
|
2014-07-27 11:25:09 -03:00
|
|
|
{
|
2011-12-05 15:40:08 -04:00
|
|
|
return _common_reduce(self, proto);
|
2008-05-26 10:42:13 -03:00
|
|
|
}
|
|
|
|
|
2014-07-27 11:25:09 -03:00
|
|
|
/*[clinic input]
|
|
|
|
bytearray.__sizeof__ as bytearray_sizeof
|
|
|
|
|
|
|
|
Returns the size of the bytearray object in memory, in bytes.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
2008-07-14 07:13:31 -03:00
|
|
|
static PyObject *
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_sizeof_impl(PyByteArrayObject *self)
|
2016-05-02 07:45:20 -03:00
|
|
|
/*[clinic end generated code: output=738abdd17951c427 input=e27320fd98a4bc5a]*/
|
2008-07-14 07:13:31 -03:00
|
|
|
{
|
Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70980 | jack.diederich | 2009-04-01 15:26:13 -0500 (Wed, 01 Apr 2009) | 3 lines
bounds check arguments to mmap.move(). All of them. Really.
fixes crasher on OS X 10.5
........
r71059 | mark.dickinson | 2009-04-02 13:39:37 -0500 (Thu, 02 Apr 2009) | 2 lines
sys.long_info attributes should be ints, not longs
........
r71225 | georg.brandl | 2009-04-05 06:54:07 -0500 (Sun, 05 Apr 2009) | 1 line
#5580: no need to use parentheses when converterr() argument is actually a type description.
........
r71234 | georg.brandl | 2009-04-05 08:16:35 -0500 (Sun, 05 Apr 2009) | 1 line
Whitespace normalization.
........
r71241 | georg.brandl | 2009-04-05 09:48:49 -0500 (Sun, 05 Apr 2009) | 1 line
#5471: fix expanduser() for $HOME set to "/".
........
r71243 | georg.brandl | 2009-04-05 10:14:29 -0500 (Sun, 05 Apr 2009) | 1 line
#5432: make plistlib docstring a raw string, since it contains examples with backslash escapes.
........
r71249 | georg.brandl | 2009-04-05 11:30:43 -0500 (Sun, 05 Apr 2009) | 1 line
#5444: adapt make.bat to new htmlhelp output file name.
........
r71251 | georg.brandl | 2009-04-05 12:17:42 -0500 (Sun, 05 Apr 2009) | 1 line
#5298: clarify docs about GIL by using more consistent wording.
........
r71255 | georg.brandl | 2009-04-05 13:34:58 -0500 (Sun, 05 Apr 2009) | 1 line
#602893: add indicator for current line in cgitb that doesnt rely on styling alone.
........
r71266 | georg.brandl | 2009-04-05 15:23:13 -0500 (Sun, 05 Apr 2009) | 1 line
Normalize issue referencing style.
........
r71299 | gregory.p.smith | 2009-04-05 18:43:58 -0500 (Sun, 05 Apr 2009) | 3 lines
Fixes issue5705: os.setuid() and friends did not accept the same range of
values that pwd.getpwnam() returns.
........
r71329 | benjamin.peterson | 2009-04-06 16:53:33 -0500 (Mon, 06 Apr 2009) | 1 line
add create_connection to __all__ #5711
........
r71397 | georg.brandl | 2009-04-08 11:36:39 -0500 (Wed, 08 Apr 2009) | 1 line
Remove redundant backtick.
........
r71398 | georg.brandl | 2009-04-08 11:39:04 -0500 (Wed, 08 Apr 2009) | 1 line
Update ignore file for suspicious builder.
........
r71486 | andrew.kuchling | 2009-04-11 11:18:14 -0500 (Sat, 11 Apr 2009) | 1 line
Re-word
........
2009-04-11 16:48:14 -03:00
|
|
|
Py_ssize_t res;
|
2008-07-14 07:13:31 -03:00
|
|
|
|
2015-12-19 14:05:25 -04:00
|
|
|
res = _PyObject_SIZE(Py_TYPE(self)) + self->ob_alloc * sizeof(char);
|
Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70980 | jack.diederich | 2009-04-01 15:26:13 -0500 (Wed, 01 Apr 2009) | 3 lines
bounds check arguments to mmap.move(). All of them. Really.
fixes crasher on OS X 10.5
........
r71059 | mark.dickinson | 2009-04-02 13:39:37 -0500 (Thu, 02 Apr 2009) | 2 lines
sys.long_info attributes should be ints, not longs
........
r71225 | georg.brandl | 2009-04-05 06:54:07 -0500 (Sun, 05 Apr 2009) | 1 line
#5580: no need to use parentheses when converterr() argument is actually a type description.
........
r71234 | georg.brandl | 2009-04-05 08:16:35 -0500 (Sun, 05 Apr 2009) | 1 line
Whitespace normalization.
........
r71241 | georg.brandl | 2009-04-05 09:48:49 -0500 (Sun, 05 Apr 2009) | 1 line
#5471: fix expanduser() for $HOME set to "/".
........
r71243 | georg.brandl | 2009-04-05 10:14:29 -0500 (Sun, 05 Apr 2009) | 1 line
#5432: make plistlib docstring a raw string, since it contains examples with backslash escapes.
........
r71249 | georg.brandl | 2009-04-05 11:30:43 -0500 (Sun, 05 Apr 2009) | 1 line
#5444: adapt make.bat to new htmlhelp output file name.
........
r71251 | georg.brandl | 2009-04-05 12:17:42 -0500 (Sun, 05 Apr 2009) | 1 line
#5298: clarify docs about GIL by using more consistent wording.
........
r71255 | georg.brandl | 2009-04-05 13:34:58 -0500 (Sun, 05 Apr 2009) | 1 line
#602893: add indicator for current line in cgitb that doesnt rely on styling alone.
........
r71266 | georg.brandl | 2009-04-05 15:23:13 -0500 (Sun, 05 Apr 2009) | 1 line
Normalize issue referencing style.
........
r71299 | gregory.p.smith | 2009-04-05 18:43:58 -0500 (Sun, 05 Apr 2009) | 3 lines
Fixes issue5705: os.setuid() and friends did not accept the same range of
values that pwd.getpwnam() returns.
........
r71329 | benjamin.peterson | 2009-04-06 16:53:33 -0500 (Mon, 06 Apr 2009) | 1 line
add create_connection to __all__ #5711
........
r71397 | georg.brandl | 2009-04-08 11:36:39 -0500 (Wed, 08 Apr 2009) | 1 line
Remove redundant backtick.
........
r71398 | georg.brandl | 2009-04-08 11:39:04 -0500 (Wed, 08 Apr 2009) | 1 line
Update ignore file for suspicious builder.
........
r71486 | andrew.kuchling | 2009-04-11 11:18:14 -0500 (Sat, 11 Apr 2009) | 1 line
Re-word
........
2009-04-11 16:48:14 -03:00
|
|
|
return PyLong_FromSsize_t(res);
|
2008-07-14 07:13:31 -03:00
|
|
|
}
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
static PySequenceMethods bytearray_as_sequence = {
|
|
|
|
(lenfunc)bytearray_length, /* sq_length */
|
2008-05-26 10:42:13 -03:00
|
|
|
(binaryfunc)PyByteArray_Concat, /* sq_concat */
|
2009-04-18 12:42:12 -03:00
|
|
|
(ssizeargfunc)bytearray_repeat, /* sq_repeat */
|
|
|
|
(ssizeargfunc)bytearray_getitem, /* sq_item */
|
|
|
|
0, /* sq_slice */
|
|
|
|
(ssizeobjargproc)bytearray_setitem, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
2016-07-03 07:57:48 -03:00
|
|
|
(objobjproc)bytearray_contains, /* sq_contains */
|
2009-04-18 12:42:12 -03:00
|
|
|
(binaryfunc)bytearray_iconcat, /* sq_inplace_concat */
|
|
|
|
(ssizeargfunc)bytearray_irepeat, /* sq_inplace_repeat */
|
2008-05-26 10:42:13 -03:00
|
|
|
};
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
static PyMappingMethods bytearray_as_mapping = {
|
|
|
|
(lenfunc)bytearray_length,
|
|
|
|
(binaryfunc)bytearray_subscript,
|
|
|
|
(objobjargproc)bytearray_ass_subscript,
|
2008-05-26 10:42:13 -03:00
|
|
|
};
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
static PyBufferProcs bytearray_as_buffer = {
|
|
|
|
(getbufferproc)bytearray_getbuffer,
|
|
|
|
(releasebufferproc)bytearray_releasebuffer,
|
2008-05-26 10:42:13 -03:00
|
|
|
};
|
|
|
|
|
|
|
|
static PyMethodDef
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_methods[] = {
|
|
|
|
{"__alloc__", (PyCFunction)bytearray_alloc, METH_NOARGS, alloc_doc},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_REDUCE_METHODDEF
|
|
|
|
BYTEARRAY_REDUCE_EX_METHODDEF
|
|
|
|
BYTEARRAY_SIZEOF_METHODDEF
|
|
|
|
BYTEARRAY_APPEND_METHODDEF
|
2008-05-26 10:42:13 -03:00
|
|
|
{"capitalize", (PyCFunction)stringlib_capitalize, METH_NOARGS,
|
|
|
|
_Py_capitalize__doc__},
|
2016-05-04 16:23:26 -03:00
|
|
|
{"center", (PyCFunction)stringlib_center, METH_VARARGS, _Py_center__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_CLEAR_METHODDEF
|
|
|
|
BYTEARRAY_COPY_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"count", (PyCFunction)bytearray_count, METH_VARARGS,
|
2016-05-04 16:23:26 -03:00
|
|
|
_Py_count__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_DECODE_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"endswith", (PyCFunction)bytearray_endswith, METH_VARARGS,
|
2016-05-04 16:23:26 -03:00
|
|
|
_Py_endswith__doc__},
|
2013-11-16 13:10:57 -04:00
|
|
|
{"expandtabs", (PyCFunction)stringlib_expandtabs, METH_VARARGS | METH_KEYWORDS,
|
2016-05-04 16:23:26 -03:00
|
|
|
_Py_expandtabs__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_EXTEND_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"find", (PyCFunction)bytearray_find, METH_VARARGS,
|
2016-05-04 16:23:26 -03:00
|
|
|
_Py_find__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_FROMHEX_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"hex", (PyCFunction)bytearray_hex, METH_NOARGS, hex__doc__},
|
|
|
|
{"index", (PyCFunction)bytearray_index, METH_VARARGS, _Py_index__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_INSERT_METHODDEF
|
2008-05-26 10:42:13 -03:00
|
|
|
{"isalnum", (PyCFunction)stringlib_isalnum, METH_NOARGS,
|
|
|
|
_Py_isalnum__doc__},
|
|
|
|
{"isalpha", (PyCFunction)stringlib_isalpha, METH_NOARGS,
|
|
|
|
_Py_isalpha__doc__},
|
|
|
|
{"isdigit", (PyCFunction)stringlib_isdigit, METH_NOARGS,
|
|
|
|
_Py_isdigit__doc__},
|
|
|
|
{"islower", (PyCFunction)stringlib_islower, METH_NOARGS,
|
|
|
|
_Py_islower__doc__},
|
|
|
|
{"isspace", (PyCFunction)stringlib_isspace, METH_NOARGS,
|
|
|
|
_Py_isspace__doc__},
|
|
|
|
{"istitle", (PyCFunction)stringlib_istitle, METH_NOARGS,
|
|
|
|
_Py_istitle__doc__},
|
|
|
|
{"isupper", (PyCFunction)stringlib_isupper, METH_NOARGS,
|
|
|
|
_Py_isupper__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_JOIN_METHODDEF
|
2016-05-04 16:23:26 -03:00
|
|
|
{"ljust", (PyCFunction)stringlib_ljust, METH_VARARGS, _Py_ljust__doc__},
|
2008-05-26 10:42:13 -03:00
|
|
|
{"lower", (PyCFunction)stringlib_lower, METH_NOARGS, _Py_lower__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_LSTRIP_METHODDEF
|
|
|
|
BYTEARRAY_MAKETRANS_METHODDEF
|
|
|
|
BYTEARRAY_PARTITION_METHODDEF
|
|
|
|
BYTEARRAY_POP_METHODDEF
|
|
|
|
BYTEARRAY_REMOVE_METHODDEF
|
|
|
|
BYTEARRAY_REPLACE_METHODDEF
|
|
|
|
BYTEARRAY_REVERSE_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"rfind", (PyCFunction)bytearray_rfind, METH_VARARGS, _Py_rfind__doc__},
|
|
|
|
{"rindex", (PyCFunction)bytearray_rindex, METH_VARARGS, _Py_rindex__doc__},
|
2016-05-04 16:23:26 -03:00
|
|
|
{"rjust", (PyCFunction)stringlib_rjust, METH_VARARGS, _Py_rjust__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_RPARTITION_METHODDEF
|
|
|
|
BYTEARRAY_RSPLIT_METHODDEF
|
|
|
|
BYTEARRAY_RSTRIP_METHODDEF
|
|
|
|
BYTEARRAY_SPLIT_METHODDEF
|
|
|
|
BYTEARRAY_SPLITLINES_METHODDEF
|
2016-07-03 07:57:48 -03:00
|
|
|
{"startswith", (PyCFunction)bytearray_startswith, METH_VARARGS ,
|
2016-05-04 16:23:26 -03:00
|
|
|
_Py_startswith__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_STRIP_METHODDEF
|
2008-05-26 10:42:13 -03:00
|
|
|
{"swapcase", (PyCFunction)stringlib_swapcase, METH_NOARGS,
|
|
|
|
_Py_swapcase__doc__},
|
|
|
|
{"title", (PyCFunction)stringlib_title, METH_NOARGS, _Py_title__doc__},
|
2014-07-27 11:25:09 -03:00
|
|
|
BYTEARRAY_TRANSLATE_METHODDEF
|
2008-05-26 10:42:13 -03:00
|
|
|
{"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__},
|
2016-05-04 16:23:26 -03:00
|
|
|
{"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, _Py_zfill__doc__},
|
2008-05-26 10:42:13 -03:00
|
|
|
{NULL}
|
|
|
|
};
|
|
|
|
|
2015-01-24 00:05:18 -04:00
|
|
|
static PyObject *
|
|
|
|
bytearray_mod(PyObject *v, PyObject *w)
|
|
|
|
{
|
|
|
|
if (!PyByteArray_Check(v))
|
|
|
|
Py_RETURN_NOTIMPLEMENTED;
|
2016-04-15 19:20:47 -03:00
|
|
|
return _PyBytes_FormatEx(PyByteArray_AS_STRING(v), PyByteArray_GET_SIZE(v), w, 1);
|
2015-01-24 00:05:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyNumberMethods bytearray_as_number = {
|
|
|
|
0, /*nb_add*/
|
|
|
|
0, /*nb_subtract*/
|
|
|
|
0, /*nb_multiply*/
|
|
|
|
bytearray_mod, /*nb_remainder*/
|
|
|
|
};
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
PyDoc_STRVAR(bytearray_doc,
|
2008-05-30 05:20:09 -03:00
|
|
|
"bytearray(iterable_of_ints) -> bytearray\n\
|
|
|
|
bytearray(string, encoding[, errors]) -> bytearray\n\
|
2011-12-17 18:18:07 -04:00
|
|
|
bytearray(bytes_or_buffer) -> mutable copy of bytes_or_buffer\n\
|
|
|
|
bytearray(int) -> bytes array of size given by the parameter initialized with null bytes\n\
|
|
|
|
bytearray() -> empty bytes array\n\
|
2008-05-26 10:42:13 -03:00
|
|
|
\n\
|
2016-04-17 02:32:47 -03:00
|
|
|
Construct a mutable bytearray object from:\n\
|
2008-05-26 10:42:13 -03:00
|
|
|
- an iterable yielding integers in range(256)\n\
|
|
|
|
- a text string encoded using the specified encoding\n\
|
2011-12-17 18:18:07 -04:00
|
|
|
- a bytes or a buffer object\n\
|
2008-05-26 10:42:13 -03:00
|
|
|
- any object implementing the buffer API.\n\
|
2011-12-17 18:18:07 -04:00
|
|
|
- an integer");
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
static PyObject *bytearray_iter(PyObject *seq);
|
2008-05-26 10:42:13 -03:00
|
|
|
|
|
|
|
PyTypeObject PyByteArray_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"bytearray",
|
|
|
|
sizeof(PyByteArrayObject),
|
|
|
|
0,
|
2009-04-18 12:42:12 -03:00
|
|
|
(destructor)bytearray_dealloc, /* tp_dealloc */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2009-02-02 16:36:42 -04:00
|
|
|
0, /* tp_reserved */
|
2009-04-18 12:42:12 -03:00
|
|
|
(reprfunc)bytearray_repr, /* tp_repr */
|
2015-01-24 00:05:18 -04:00
|
|
|
&bytearray_as_number, /* tp_as_number */
|
2009-04-18 12:42:12 -03:00
|
|
|
&bytearray_as_sequence, /* tp_as_sequence */
|
|
|
|
&bytearray_as_mapping, /* tp_as_mapping */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_str, /* tp_str */
|
2008-05-26 10:42:13 -03:00
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
2009-04-18 12:42:12 -03:00
|
|
|
&bytearray_as_buffer, /* tp_as_buffer */
|
2008-05-26 10:42:13 -03:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_doc, /* tp_doc */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
2009-04-18 12:42:12 -03:00
|
|
|
(richcmpfunc)bytearray_richcompare, /* tp_richcompare */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_weaklistoffset */
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_iter, /* tp_iter */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_iternext */
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_methods, /* tp_methods */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
2009-04-18 12:42:12 -03:00
|
|
|
(initproc)bytearray_init, /* tp_init */
|
2008-05-26 10:42:13 -03:00
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
PyType_GenericNew, /* tp_new */
|
|
|
|
PyObject_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*********************** Bytes Iterator ****************************/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
Py_ssize_t it_index;
|
|
|
|
PyByteArrayObject *it_seq; /* Set to NULL when iterator is exhausted */
|
|
|
|
} bytesiterobject;
|
|
|
|
|
|
|
|
static void
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearrayiter_dealloc(bytesiterobject *it)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
_PyObject_GC_UNTRACK(it);
|
|
|
|
Py_XDECREF(it->it_seq);
|
|
|
|
PyObject_GC_Del(it);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearrayiter_traverse(bytesiterobject *it, visitproc visit, void *arg)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_VISIT(it->it_seq);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearrayiter_next(bytesiterobject *it)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
PyByteArrayObject *seq;
|
|
|
|
PyObject *item;
|
|
|
|
|
|
|
|
assert(it != NULL);
|
|
|
|
seq = it->it_seq;
|
|
|
|
if (seq == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyByteArray_Check(seq));
|
|
|
|
|
|
|
|
if (it->it_index < PyByteArray_GET_SIZE(seq)) {
|
|
|
|
item = PyLong_FromLong(
|
2013-10-05 16:12:18 -03:00
|
|
|
(unsigned char)PyByteArray_AS_STRING(seq)[it->it_index]);
|
2008-05-26 10:42:13 -03:00
|
|
|
if (item != NULL)
|
|
|
|
++it->it_index;
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
it->it_seq = NULL;
|
Issue #26494: Fixed crash on iterating exhausting iterators.
Affected classes are generic sequence iterators, iterators of str, bytes,
bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding
views and os.scandir() iterator.
2016-03-30 14:40:02 -03:00
|
|
|
Py_DECREF(seq);
|
2008-05-26 10:42:13 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2012-04-03 07:49:41 -03:00
|
|
|
bytearrayiter_length_hint(bytesiterobject *it)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
Py_ssize_t len = 0;
|
2016-07-03 08:41:36 -03:00
|
|
|
if (it->it_seq) {
|
2008-05-26 10:42:13 -03:00
|
|
|
len = PyByteArray_GET_SIZE(it->it_seq) - it->it_index;
|
2016-07-03 08:41:36 -03:00
|
|
|
if (len < 0) {
|
|
|
|
len = 0;
|
|
|
|
}
|
|
|
|
}
|
2008-05-26 10:42:13 -03:00
|
|
|
return PyLong_FromSsize_t(len);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(length_hint_doc,
|
|
|
|
"Private method returning an estimate of len(list(it)).");
|
|
|
|
|
2012-04-03 07:49:41 -03:00
|
|
|
static PyObject *
|
|
|
|
bytearrayiter_reduce(bytesiterobject *it)
|
|
|
|
{
|
|
|
|
if (it->it_seq != NULL) {
|
2012-04-04 19:04:20 -03:00
|
|
|
return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"),
|
2012-04-03 07:49:41 -03:00
|
|
|
it->it_seq, it->it_index);
|
|
|
|
} else {
|
2016-11-20 06:16:46 -04:00
|
|
|
return Py_BuildValue("N(())", _PyObject_GetBuiltin("iter"));
|
2012-04-03 07:49:41 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
bytearrayiter_setstate(bytesiterobject *it, PyObject *state)
|
|
|
|
{
|
|
|
|
Py_ssize_t index = PyLong_AsSsize_t(state);
|
|
|
|
if (index == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
2014-03-05 09:47:57 -04:00
|
|
|
if (it->it_seq != NULL) {
|
|
|
|
if (index < 0)
|
|
|
|
index = 0;
|
|
|
|
else if (index > PyByteArray_GET_SIZE(it->it_seq))
|
|
|
|
index = PyByteArray_GET_SIZE(it->it_seq); /* iterator exhausted */
|
|
|
|
it->it_index = index;
|
|
|
|
}
|
2012-04-03 07:49:41 -03:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
|
|
|
|
|
2009-04-18 12:42:12 -03:00
|
|
|
static PyMethodDef bytearrayiter_methods[] = {
|
2012-04-03 07:49:41 -03:00
|
|
|
{"__length_hint__", (PyCFunction)bytearrayiter_length_hint, METH_NOARGS,
|
2008-05-26 10:42:13 -03:00
|
|
|
length_hint_doc},
|
2012-04-03 07:49:41 -03:00
|
|
|
{"__reduce__", (PyCFunction)bytearrayiter_reduce, METH_NOARGS,
|
2014-07-27 11:25:09 -03:00
|
|
|
bytearray_reduce__doc__},
|
2012-04-03 07:49:41 -03:00
|
|
|
{"__setstate__", (PyCFunction)bytearrayiter_setstate, METH_O,
|
|
|
|
setstate_doc},
|
2008-05-26 10:42:13 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
|
|
|
PyTypeObject PyByteArrayIter_Type = {
|
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"bytearray_iterator", /* tp_name */
|
|
|
|
sizeof(bytesiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
2009-04-18 12:42:12 -03:00
|
|
|
(destructor)bytearrayiter_dealloc, /* tp_dealloc */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
2009-02-02 16:36:42 -04:00
|
|
|
0, /* tp_reserved */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
|
|
|
|
0, /* tp_doc */
|
2009-04-18 12:42:12 -03:00
|
|
|
(traverseproc)bytearrayiter_traverse, /* tp_traverse */
|
2008-05-26 10:42:13 -03:00
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
2009-04-18 12:42:12 -03:00
|
|
|
(iternextfunc)bytearrayiter_next, /* tp_iternext */
|
|
|
|
bytearrayiter_methods, /* tp_methods */
|
2008-05-26 10:42:13 -03:00
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyObject *
|
2009-04-18 12:42:12 -03:00
|
|
|
bytearray_iter(PyObject *seq)
|
2008-05-26 10:42:13 -03:00
|
|
|
{
|
|
|
|
bytesiterobject *it;
|
|
|
|
|
|
|
|
if (!PyByteArray_Check(seq)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
it = PyObject_GC_New(bytesiterobject, &PyByteArrayIter_Type);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
it->it_index = 0;
|
|
|
|
Py_INCREF(seq);
|
|
|
|
it->it_seq = (PyByteArrayObject *)seq;
|
|
|
|
_PyObject_GC_TRACK(it);
|
|
|
|
return (PyObject *)it;
|
|
|
|
}
|