Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-04 14:32:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-23867: Argument Clinic: inline parsing code for a single positional parameter. (GH-9689)

Browse source
This commit is contained in:
Serhiy Storchaka 2018-12-25 13:23:47 +02:00 • committed by GitHub
parent 65ce60aef1
commit 32d96a2b5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 1677 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Modules/clinic/arraymodule.c.h generated
View file

@ -278,8 +278,22 @@ array_array_fromstring(arrayobject *self, PyObject *arg)
PyObject *return_value = NULL;
Py_buffer buffer = {NULL, NULL};
if (!PyArg_Parse(arg, "s*:fromstring", &buffer)) {
goto exit;
if (PyUnicode_Check(arg)) {
Py_ssize_t len;
const char *ptr = PyUnicode_AsUTF8AndSize(arg, &len);
if (ptr == NULL) {
goto exit;
}
PyBuffer_FillInfo(&buffer, arg, (void *)ptr, len, 1, 0);
}
else { /* any bytes-like object */
if (PyObject_GetBuffer(arg, &buffer, PyBUF_SIMPLE) != 0) {
goto exit;
}
if (!PyBuffer_IsContiguous(&buffer, 'C')) {
_PyArg_BadArgument("fromstring", "contiguous buffer", arg);
goto exit;
}
}
return_value = array_array_fromstring_impl(self, &buffer);
@ -310,7 +324,11 @@ array_array_frombytes(arrayobject *self, PyObject *arg)
PyObject *return_value = NULL;
Py_buffer buffer = {NULL, NULL};
if (!PyArg_Parse(arg, "y*:frombytes", &buffer)) {
if (PyObject_GetBuffer(arg, &buffer, PyBUF_SIMPLE) != 0) {
goto exit;
}
if (!PyBuffer_IsContiguous(&buffer, 'C')) {
_PyArg_BadArgument("frombytes", "contiguous buffer", arg);
goto exit;
}
return_value = array_array_frombytes_impl(self, &buffer);
@ -505,4 +523,4 @@ PyDoc_STRVAR(array_arrayiterator___setstate____doc__,
#define ARRAY_ARRAYITERATOR___SETSTATE___METHODDEF \
{"__setstate__", (PyCFunction)array_arrayiterator___setstate__, METH_O, array_arrayiterator___setstate____doc__},
/*[clinic end generated code: output=3d2bb1aa81541cbd input=a9049054013a1b77]*/
/*[clinic end generated code: output=15da19d2ece09d22 input=a9049054013a1b77]*/