8000 gh-111178: Fix function signatures of unicodeiter by vstinner · Pull Request #130684 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-111178: Fix function signatures of unicodeiter #130684

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
merged 2 commits into from
Mar 4, 2025
Merged

gh-111178: Fix function signatures of unicodeiter #130684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e03dc04
gh-111178: Fix function signatures of unicodeiter
vstinner Feb 28, 2025
fb627f4
Change more signatures
vstinner Feb 28, 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
42 changes: 23 additions & 19 deletions Objects/unicodeobject.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -16026,23 +16026,26 @@ typedef struct {
} unicodeiterobject;

static void
unicodeiter_dealloc(unicodeiterobject *it)
unicodeiter_dealloc(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
_PyObject_GC_UNTRACK(it);
Py_XDECREF(it->it_seq);
PyObject_GC_Del(it);
}

static int
unicodeiter_traverse(unicodeiterobject *it, visitproc visit, void *arg)
unicodeiter_traverse(PyObject *op, visitproc visit, void *arg)
{
unicodeiterobject *it = (unicodeiterobject *)op;
Py_VISIT(it->it_seq);
return 0;
}

static PyObject *
unicodeiter_next(unicodeiterobject *it)
unicodeiter_next(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
PyObject *seq;

assert(it != NULL);
Expand All @@ -16065,8 +16068,9 @@ unicodeiter_next(unicodeiterobject *it)
}

static PyObject *
unicode_ascii_iter_next(unicodeiterobject *it)
unicode_ascii_iter_next(PyObject *op)
{
unicodeiterobject *it = (unicodeiterobject *)op;
assert(it != NULL);
PyObject *seq = it->it_seq;
if (seq == NULL) {
Expand All @@ -16087,8 +16091,9 @@ unicode_ascii_iter_next(unicodeiterobject *it)
}

static PyObject *
unicodeiter_len(unicodeiterobject *it, PyObject *Py_UNUSED(ignored))
unicodeiter_len(PyObject *op, PyObject *Py_UNUSED(ignored))
{
unicodeiterobject *it = (unicodeiterobject *)op;
Py_ssize_t len = 0;
if (it->it_seq)
len = PyUnicode_GET_LENGTH(it->it_seq) - it->it_index;
Expand All @@ -16098,8 +16103,9 @@ unicodeiter_len(unicodeiterobject *it, PyObject *Py_UNUSED(ignored))
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");

static PyObject *
unicodeiter_reduce(unicodeiterobject *it, PyObject *Py_UNUSED(ignored))
unicodeiter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
{
unicodeiterobject *it = (unicodeiterobject *)op;
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));

/* _PyEval_GetBuiltin can invoke arbitrary code,
Expand All @@ -16121,8 +16127,9 @@ unicodeiter_reduce(unicodeiterobject *it, PyObject *Py_UNUSED(ignored))
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");

static PyObject *
unicodeiter_setstate(unicodeiterobject *it, PyObject *state)
unicodeiter_setstate(PyObject *op, PyObject *state)
{
unicodeiterobject *it = (unicodeiterobject *)op;
Py_ssize_t index = PyLong_AsSsize_t(state);
if (index == -1 && PyErr_Occurred())
return NULL;
Expand All @@ -16139,12 +16146,9 @@ unicodeiter_setstate(unicodeiterobject *it, PyObject *state)
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");

static PyMethodDef unicodeiter_methods[] = {
{"__length_hint__", (PyCFunction)unicodeiter_len, METH_NOARGS,
length_hint_doc},
{"__reduce__", (PyCFunction)unicodeiter_reduce, METH_NOARGS,
reduce_doc},
{"__setstate__", (PyCFunction)unicodeiter_setstate, METH_O,
setstate_doc},
{"__length_hint__", unicodeiter_len, METH_NOARGS, length_hint_doc},
{"__reduce__", unicodeiter_reduce, METH_NOARGS, reduce_doc},
{"__setstate__", unicodeiter_setstate, METH_O, setstate_doc},
{NULL, NULL} /* sentinel */
};

Expand All @@ -16154,7 +16158,7 @@ PyTypeObject PyUnicodeIter_Type = {
sizeof(unicodeiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)unicodeiter_dealloc, /* tp_dealloc */
unicodeiter_dealloc,/* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand All @@ -16171,12 +16175,12 @@ PyTypeObject PyUnicodeIter_Type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
0, /* tp_doc */
(traverseproc)unicodeiter_traverse, /* tp_traverse */
unicodeiter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */
(iternextfunc)unicodeiter_next, /* tp_iternext */
unicodeiter_next, /* tp_iternext */
unicodeiter_methods, /* tp_methods */
0,
};
Expand All @@ -16185,12 +16189,12 @@ PyTypeObject _PyUnicodeASCIIIter_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "str_ascii_iterator",
.tp_basicsize = sizeof(unicodeiterobject),
.tp_dealloc = (destructor)unicodeiter_dealloc,
.tp_dealloc = unicodeiter_dealloc,
.tp_getattro = PyObject_GenericGetAttr,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
.tp_traverse = (traverseproc)unicodeiter_traverse,
.tp_traverse = unicodeiter_traverse,
.tp_iter = PyObject_SelfIter,
.tp_iternext = (iternextfunc)unicode_ascii_iter_next,
.tp_iternext = unicode_ascii_iter_next,
.tp_methods = unicodeiter_methods,
};

Expand Down
Loading
0