Skip to content
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

Suggestion: refactor to avoid incref/decref #23

Open
wants to merge 2 commits into
base: pyarg-deprecate-sequences
Choose a base branch
from
Open

Suggestion: refactor to avoid incref/decref #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b781ae7
Refactor to avoid incref/decref
erlend-aasland Jan 2, 2025
6374772
Address review
erlend-aasland Jan 2, 2025
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
52 changes: 31 additions & 21 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,27 @@ seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname,
}


static const char *
converttupleitems(PyObject *arg, const char **p_format, va_list *p_va,
int flags, int *levels, char *msgbuf, size_t bufsize,
freelist_t *freelist)
{
const char *format = *p_format;
int n = PyTuple_GET_SIZE(arg);
for (int i = 0; i < n; i++) {
PyObject *item = PyTuple_GET_ITEM(arg, i);
const char *msg = convertitem(item, &format, p_va, flags, levels+1,
msgbuf, bufsize, freelist);
if (msg != NULL) {
levels[0] = i+1;
return msg;
}
}
*p_format = format;
return NULL;
}


/* Convert a tuple argument.
On entry, *p_format points to the character _after_ the opening '('.
On successful exit, *p_format points to the closing ')'.
Expand All @@ -463,7 +484,6 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
int level = 0;
int n = 0;
const char *format = *p_format;
int i;
Py_ssize_t len;
int mustbetuple = PyTuple_Check(arg);

Expand Down Expand Up @@ -513,7 +533,7 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
}

if (PyTuple_Check(arg)) {
Py_INCREF(arg);
// Pass.
}
else if (!PySequence_Check(arg) ||
PyUnicode_Check(arg) || PyBytes_Check(arg) || PyByteArray_Check(arg))
Expand Down Expand Up @@ -541,10 +561,15 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
mustbetuple ? "tuple" : "sequence", n, len);
return msgbuf;
}
arg = PySequence_Tuple(arg);
if (arg == NULL) {
PyObject *tuple = PySequence_Tuple(arg);
if (tuple == NULL) {
return msgbuf;
}

const char *ret = converttupleitems(tuple, p_format, p_va, flags,
levels, msgbuf, bufsize, freelist);
Py_DECREF(tuple);
return ret;
}

len = PyTuple_GET_SIZE(arg);
Expand All @@ -553,26 +578,11 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyOS_snprintf(msgbuf, bufsize,
"must be tuple of length %d, not %zd",
n, len);
Py_DECREF(arg);
return msgbuf;
}

format = *p_format;
for (i = 0; i < n; i++) {
const char *msg;
PyObject *item = PyTuple_GET_ITEM(arg, i);
msg = convertitem(item, &format, p_va, flags, levels+1,
msgbuf, bufsize, freelist);
if (msg != NULL) {
levels[0] = i+1;
Py_DECREF(arg);
return msg;
}
}

*p_format = format;
Py_DECREF(arg);
return NULL;
return converttupleitems(arg, p_format, p_va, flags, levels,
msgbuf, bufsize, freelist);
}


Expand Down