Skip to content

gh-93649: Split getargs testing from _testcapimodule.c #99346

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 4 commits into from
Nov 14, 2022
Merged

gh-93649: Split getargs testing from _testcapimodule.c #99346

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff37535
gh-93649: Split getargs testing from _testcapimodule.c
erlend-aasland Nov 10, 2022
5dfdd5c
Modernise a little bit
erlend-aasland Nov 11, 2022
5d1df0d
Sync with main
erlend-aasland Nov 14, 2022
cd671a1
Merge branch 'main' into testcapi/extract-arg-stuff
erlend-aasland Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modernise a little bit 
- a couple of PEP 7 nits
- use intermingled decls a few places
- Use Py_NewRef() API to save a few lines
  • Loading branch information
@erlend-aasland
erlend-aasland committed Nov 11, 2022
commit 5dfdd5cd71df6e2004b0b365a669c26b1b78e555
57 changes: 24 additions & 33 deletions Modules/_testcapi/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ parse_tuple_and_keywords(PyObject *self, PyObject *args)
PyObject *return_value = NULL;

if (!PyArg_ParseTuple(args, "OOsO:parse_tuple_and_keywords",
&sub_args, &sub_kwargs,
&sub_format, &sub_keywords))
&sub_args, &sub_kwargs, &sub_format, &sub_keywords))
{
return NULL;
}

if (!(PyList_CheckExact(sub_keywords) ||
PyTuple_CheckExact(sub_keywords)))
Expand Down Expand Up @@ -63,8 +64,7 @@ parse_tuple_and_keywords(PyObject *self, PyObject *args)
buffers + 4, buffers + 5, buffers + 6, buffers + 7);

if (result) {
return_value = Py_None;
Py_INCREF(Py_None);
return_value = Py_NewRef(Py_None);
}

exit:
Expand All @@ -81,8 +81,7 @@ get_args(PyObject *self, PyObject *args)
if (args == NULL) {
args = Py_None;
}
Py_INCREF(args);
return args;
return Py_NewRef(args);
}

static PyObject *
Expand All @@ -91,8 +90,7 @@ get_kwargs(PyObject *self, PyObject *args, PyObject *kwargs)
if (kwargs == NULL) {
kwargs = Py_None;
}
Py_INCREF(kwargs);
return kwargs;
return Py_NewRef(kwargs);
}

static PyObject *
Expand Down Expand Up @@ -161,7 +159,7 @@ getargs_keywords(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *keywords[] = {"arg1","arg2","arg3","arg4","arg5", NULL};
static const char fmt[] = "(ii)i|(i(ii))(iii)i";
int int_args[10]={-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
int int_args[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords,
&int_args[0], &int_args[1], &int_args[2], &int_args[3], &int_args[4],
Expand Down Expand Up @@ -438,8 +436,7 @@ getargs_S(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "S", &obj)) {
return NULL;
}
Py_INCREF(obj);
return obj;
return Py_NewRef(obj);
}

static PyObject *
Expand All @@ -449,8 +446,7 @@ getargs_Y(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "Y", &obj)) {
return NULL;
}
Py_INCREF(obj);
return obj;
return Py_NewRef(obj);
}

static PyObject *
Expand All @@ -460,8 +456,7 @@ getargs_U(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "U", &obj)) {
return NULL;
}
Py_INCREF(obj);
return obj;
return Py_NewRef(obj);
}

static PyObject *
Expand Down Expand Up @@ -543,8 +538,7 @@ getargs_z_star(PyObject *self, PyObject *args)
bytes = PyBytes_FromStringAndSize(buffer.buf, buffer.len);
}
else {
Py_INCREF(Py_None);
bytes = Py_None;
bytes = Py_NewRef(Py_None);
}
PyBuffer_Release(&buffer);
return bytes;
Expand Down Expand Up @@ -578,11 +572,10 @@ static PyObject *
getargs_y_star(PyObject *self, PyObject *args)
{
Py_buffer buffer;
PyObject *bytes;
if (!PyArg_ParseTuple(args, "y*", &buffer)) {
return NULL;
}
bytes = PyBytes_FromStringAndSize(buffer.buf, buffer.len);
PyObject *bytes = PyBytes_FromStringAndSize(buffer.buf, buffer.len);
PyBuffer_Release(&buffer);
return bytes;
}
Expand Down Expand Up @@ -649,7 +642,7 @@ getargs_Z_hash(PyObject *self, PyObject *args)
static PyObject *
getargs_es(PyObject *self, PyObject *args)
{
PyObject *arg, *result;
PyObject *arg;
const char *encoding = NULL;
char *str;

Expand All @@ -659,15 +652,15 @@ getargs_es(PyObject *self, PyObject *args)
if (!PyArg_Parse(arg, "es", encoding, &str)) {
return NULL;
}
result = PyBytes_FromString(str);
PyObject *result = PyBytes_FromString(str);
PyMem_Free(str);
return result;
}

static PyObject *
getargs_et(PyObject *self, PyObject *args)
{
PyObject *arg, *result;
PyObject *arg;
const char *encoding = NULL;
char *str;

Expand All @@ -677,15 +670,15 @@ getargs_et(PyObject *self, PyObject *args)
if (!PyArg_Parse(arg, "et", encoding, &str)) {
return NULL;
}
result = PyBytes_FromString(str);
PyObject *result = PyBytes_FromString(str);
PyMem_Free(str);
return result;
}

static PyObject *
getargs_es_hash(PyObject *self, PyObject *args)
{
PyObject *arg, *result;
PyObject *arg;
const char *encoding = NULL;
PyByteArrayObject *buffer = NULL;
char *str = NULL;
Expand All @@ -701,7 +694,7 @@ getargs_es_hash(PyObject *self, PyObject *args)
if (!PyArg_Parse(arg, "es#", encoding, &str, &size)) {
return NULL;
}
result = PyBytes_FromStringAndSize(str, size);
PyObject *result = PyBytes_FromStringAndSize(str, size);
if (buffer == NULL) {
PyMem_Free(str);
}
Expand All @@ -711,7 +704,7 @@ getargs_es_hash(PyObject *self, PyObject *args)
static PyObject *
getargs_et_hash(PyObject *self, PyObject *args)
{
PyObject *arg, *result;
PyObject *arg;
const char *encoding = NULL;
PyByteArrayObject *buffer = NULL;
char *str = NULL;
Expand All @@ -727,7 +720,7 @@ getargs_et_hash(PyObject *self, PyObject *args)
if (!PyArg_Parse(arg, "et#", encoding, &str, &size)) {
return NULL;
}
result = PyBytes_FromStringAndSize(str, size);
PyObject *result = PyBytes_FromStringAndSize(str, size);
if (buffer == NULL) {
PyMem_Free(str);
}
Expand Down Expand Up @@ -794,16 +787,13 @@ static PyObject *
test_s_code(PyObject *self, PyObject *Py_UNUSED(ignored))
{
/* Unicode strings should be accepted */
PyObject *tuple, *obj;
char *value;

tuple = PyTuple_New(1);
PyObject *tuple = PyTuple_New(1);
if (tuple == NULL) {
return NULL;
}

obj = PyUnicode_Decode("t\xeate", strlen("t\xeate"),
"latin-1", NULL);
PyObject *obj = PyUnicode_Decode("t\xeate", strlen("t\xeate"),
"latin-1", NULL);
if (obj == NULL) {
return NULL;
}
Expand All @@ -813,6 +803,7 @@ test_s_code(PyObject *self, PyObject *Py_UNUSED(ignored))
/* These two blocks used to raise a TypeError:
* "argument must be string without null bytes, not str"
*/
char *value;
if (!PyArg_ParseTuple(tuple, "s:test_s_code1", &value)) {
return NULL;
}
Expand Down