mirror of
https://github.com/python/cpython.git
synced 2025-12-23 09:19:18 +00:00
[3.12] gh-111495: Add tests for PyBytes and PyByteArray C API (GH-111496) (GH-111607)
(cherry picked from commit 97b3cd38d1)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot)
GitHub
parent
d3d2cfead7
commit
f1087855e2
5 changed files with 727 additions and 1 deletions
|
|
@ -1,8 +1,115 @@
|
|||
#define PY_SSIZE_T_CLEAN
|
||||
#include "parts.h"
|
||||
#include "util.h"
|
||||
|
||||
|
||||
/* Test PyByteArray_Check() */
|
||||
static PyObject *
|
||||
bytearray_check(PyObject *Py_UNUSED(module), PyObject *obj)
|
||||
{
|
||||
NULLABLE(obj);
|
||||
return PyLong_FromLong(PyByteArray_Check(obj));
|
||||
}
|
||||
|
||||
/* Test PyByteArray_CheckExact() */
|
||||
static PyObject *
|
||||
bytearray_checkexact(PyObject *Py_UNUSED(module), PyObject *obj)
|
||||
{
|
||||
NULLABLE(obj);
|
||||
return PyLong_FromLong(PyByteArray_CheckExact(obj));
|
||||
}
|
||||
|
||||
/* Test PyByteArray_FromStringAndSize() */
|
||||
static PyObject *
|
||||
bytearray_fromstringandsize(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
const char *s;
|
||||
Py_ssize_t bsize;
|
||||
Py_ssize_t size = -100;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "z#|n", &s, &bsize, &size)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (size == -100) {
|
||||
size = bsize;
|
||||
}
|
||||
return PyByteArray_FromStringAndSize(s, size);
|
||||
}
|
||||
|
||||
/* Test PyByteArray_FromObject() */
|
||||
static PyObject *
|
||||
bytearray_fromobject(PyObject *Py_UNUSED(module), PyObject *arg)
|
||||
{
|
||||
NULLABLE(arg);
|
||||
return PyByteArray_FromObject(arg);
|
||||
}
|
||||
|
||||
/* Test PyByteArray_Size() */
|
||||
static PyObject *
|
||||
bytearray_size(PyObject *Py_UNUSED(module), PyObject *arg)
|
||||
{
|
||||
NULLABLE(arg);
|
||||
RETURN_SIZE(PyByteArray_Size(arg));
|
||||
}
|
||||
|
||||
/* Test PyUnicode_AsString() */
|
||||
static PyObject *
|
||||
bytearray_asstring(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
Py_ssize_t buflen;
|
||||
const char *s;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "On", &obj, &buflen))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
s = PyByteArray_AsString(obj);
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
|
||||
return PyByteArray_FromStringAndSize(s, buflen);
|
||||
}
|
||||
|
||||
/* Test PyByteArray_Concat() */
|
||||
static PyObject *
|
||||
bytearray_concat(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *left, *right;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "OO", &left, &right))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(left);
|
||||
NULLABLE(right);
|
||||
return PyByteArray_Concat(left, right);
|
||||
}
|
||||
|
||||
/* Test PyByteArray_Resize() */
|
||||
static PyObject *
|
||||
bytearray_resize(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
Py_ssize_t size;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "On", &obj, &size))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
RETURN_INT(PyByteArray_Resize(obj, size));
|
||||
}
|
||||
|
||||
|
||||
static PyMethodDef test_methods[] = {
|
||||
{"bytearray_check", bytearray_check, METH_O},
|
||||
{"bytearray_checkexact", bytearray_checkexact, METH_O},
|
||||
{"bytearray_fromstringandsize", bytearray_fromstringandsize, METH_VARARGS},
|
||||
{"bytearray_fromobject", bytearray_fromobject, METH_O},
|
||||
{"bytearray_size", bytearray_size, METH_O},
|
||||
{"bytearray_asstring", bytearray_asstring, METH_VARARGS},
|
||||
{"bytearray_concat", bytearray_concat, METH_VARARGS},
|
||||
{"bytearray_resize", bytearray_resize, METH_VARARGS},
|
||||
{NULL},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,247 @@
|
|||
#define PY_SSIZE_T_CLEAN
|
||||
#include "parts.h"
|
||||
#include "util.h"
|
||||
|
||||
|
||||
/* Test PyBytes_Check() */
|
||||
static PyObject *
|
||||
bytes_check(PyObject *Py_UNUSED(module), PyObject *obj)
|
||||
{
|
||||
NULLABLE(obj);
|
||||
return PyLong_FromLong(PyBytes_Check(obj));
|
||||
}
|
||||
|
||||
/* Test PyBytes_CheckExact() */
|
||||
static PyObject *
|
||||
bytes_checkexact(PyObject *Py_UNUSED(module), PyObject *obj)
|
||||
{
|
||||
NULLABLE(obj);
|
||||
return PyLong_FromLong(PyBytes_CheckExact(obj));
|
||||
}
|
||||
|
||||
/* Test PyBytes_FromStringAndSize() */
|
||||
static PyObject *
|
||||
bytes_fromstringandsize(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
const char *s;
|
||||
Py_ssize_t bsize;
|
||||
Py_ssize_t size = -100;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "z#|n", &s, &bsize, &size)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (size == -100) {
|
||||
size = bsize;
|
||||
}
|
||||
return PyBytes_FromStringAndSize(s, size);
|
||||
}
|
||||
|
||||
/* Test PyBytes_FromString() */
|
||||
static PyObject *
|
||||
bytes_fromstring(PyObject *Py_UNUSED(module), PyObject *arg)
|
||||
{
|
||||
const char *s;
|
||||
Py_ssize_t size;
|
||||
|
||||
if (!PyArg_Parse(arg, "z#", &s, &size)) {
|
||||
return NULL;
|
||||
}
|
||||
return PyBytes_FromString(s);
|
||||
}
|
||||
|
||||
/* Test PyBytes_FromObject() */
|
||||
static PyObject *
|
||||
bytes_fromobject(PyObject *Py_UNUSED(module), PyObject *arg)
|
||||
{
|
||||
NULLABLE(arg);
|
||||
return PyBytes_FromObject(arg);
|
||||
}
|
||||
|
||||
/* Test PyBytes_Size() */
|
||||
static PyObject *
|
||||
bytes_size(PyObject *Py_UNUSED(module), PyObject *arg)
|
||||
{
|
||||
NULLABLE(arg);
|
||||
RETURN_SIZE(PyBytes_Size(arg));
|
||||
}
|
||||
|
||||
/* Test PyUnicode_AsString() */
|
||||
static PyObject *
|
||||
bytes_asstring(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
Py_ssize_t buflen;
|
||||
const char *s;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "On", &obj, &buflen))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
s = PyBytes_AsString(obj);
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
|
||||
return PyBytes_FromStringAndSize(s, buflen);
|
||||
}
|
||||
|
||||
/* Test PyBytes_AsStringAndSize() */
|
||||
static PyObject *
|
||||
bytes_asstringandsize(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
Py_ssize_t buflen;
|
||||
char *s = UNINITIALIZED_PTR;
|
||||
Py_ssize_t size = UNINITIALIZED_SIZE;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "On", &obj, &buflen))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
if (PyBytes_AsStringAndSize(obj, &s, &size) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (s == NULL) {
|
||||
return Py_BuildValue("(On)", Py_None, size);
|
||||
}
|
||||
else {
|
||||
return Py_BuildValue("(y#n)", s, buflen, size);
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
bytes_asstringandsize_null(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
Py_ssize_t buflen;
|
||||
char *s = UNINITIALIZED_PTR;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "On", &obj, &buflen))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
if (PyBytes_AsStringAndSize(obj, &s, NULL) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (s == NULL) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
else {
|
||||
return PyBytes_FromStringAndSize(s, buflen);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test PyBytes_Repr() */
|
||||
static PyObject *
|
||||
bytes_repr(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
int smartquotes;
|
||||
if (!PyArg_ParseTuple(args, "Oi", &obj, &smartquotes))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(obj);
|
||||
return PyBytes_Repr(obj, smartquotes);
|
||||
}
|
||||
|
||||
/* Test PyBytes_Concat() */
|
||||
static PyObject *
|
||||
bytes_concat(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *left, *right;
|
||||
int new = 0;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "OO|p", &left, &right, &new))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(left);
|
||||
NULLABLE(right);
|
||||
if (new) {
|
||||
assert(left != NULL);
|
||||
assert(PyBytes_CheckExact(left));
|
||||
left = PyBytes_FromStringAndSize(PyBytes_AS_STRING(left),
|
||||
PyBytes_GET_SIZE(left));
|
||||
if (left == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else {
|
||||
Py_XINCREF(left);
|
||||
}
|
||||
PyBytes_Concat(&left, right);
|
||||
if (left == NULL && !PyErr_Occurred()) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
return left;
|
||||
}
|
||||
|
||||
/* Test PyBytes_ConcatAndDel() */
|
||||
static PyObject *
|
||||
bytes_concatanddel(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
PyObject *left, *right;
|
||||
int new = 0;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "OO|p", &left, &right, &new))
|
||||
return NULL;
|
||||
|
||||
NULLABLE(left);
|
||||
NULLABLE(right);
|
||||
if (new) {
|
||||
assert(left != NULL);
|
||||
assert(PyBytes_CheckExact(left));
|
||||
left = PyBytes_FromStringAndSize(PyBytes_AS_STRING(left),
|
||||
PyBytes_GET_SIZE(left));
|
||||
if (left == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
else {
|
||||
Py_XINCREF(left);
|
||||
}
|
||||
Py_XINCREF(right);
|
||||
PyBytes_ConcatAndDel(&left, right);
|
||||
if (left == NULL && !PyErr_Occurred()) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
return left;
|
||||
}
|
||||
|
||||
/* Test PyBytes_DecodeEscape() */
|
||||
static PyObject *
|
||||
bytes_decodeescape(PyObject *Py_UNUSED(module), PyObject *args)
|
||||
{
|
||||
const char *s;
|
||||
Py_ssize_t bsize;
|
||||
Py_ssize_t size = -100;
|
||||
const char *errors = NULL;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "z#|zn", &s, &bsize, &errors, &size))
|
||||
return NULL;
|
||||
|
||||
if (size == -100) {
|
||||
size = bsize;
|
||||
}
|
||||
return PyBytes_DecodeEscape(s, size, errors, 0, NULL);
|
||||
}
|
||||
|
||||
|
||||
static PyMethodDef test_methods[] = {
|
||||
{"bytes_check", bytes_check, METH_O},
|
||||
{"bytes_checkexact", bytes_checkexact, METH_O},
|
||||
{"bytes_fromstringandsize", bytes_fromstringandsize, METH_VARARGS},
|
||||
{"bytes_fromstring", bytes_fromstring, METH_O},
|
||||
{"bytes_fromobject", bytes_fromobject, METH_O},
|
||||
{"bytes_size", bytes_size, METH_O},
|
||||
{"bytes_asstring", bytes_asstring, METH_VARARGS},
|
||||
{"bytes_asstringandsize", bytes_asstringandsize, METH_VARARGS},
|
||||
{"bytes_asstringandsize_null", bytes_asstringandsize_null, METH_VARARGS},
|
||||
{"bytes_repr", bytes_repr, METH_VARARGS},
|
||||
{"bytes_concat", bytes_concat, METH_VARARGS},
|
||||
{"bytes_concatanddel", bytes_concatanddel, METH_VARARGS},
|
||||
{"bytes_decodeescape", bytes_decodeescape, METH_VARARGS},
|
||||
{NULL},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue