Skip to content

Commit bbe5baa

Browse files
authored
gh-111178: Fix function signatures for test_types (#131455)
1 parent f5e4c29 commit bbe5baa

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

Objects/namespaceobject.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ namespace_richcompare(PyObject *self, PyObject *other, int op)
204204
PyDoc_STRVAR(namespace_reduce__doc__, "Return state information for pickling");
205205

206206
static PyObject *
207-
namespace_reduce(_PyNamespaceObject *ns, PyObject *Py_UNUSED(ignored))
207+
namespace_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
208208
{
209+
_PyNamespaceObject *ns = (_PyNamespaceObject*)op;
209210
PyObject *result, *args = PyTuple_New(0);
210211

211212
if (!args)
@@ -245,7 +246,7 @@ namespace_replace(PyObject *self, PyObject *args, PyObject *kwargs)
245246

246247

247248
static PyMethodDef namespace_methods[] = {
248-
{"__reduce__", (PyCFunction)namespace_reduce, METH_NOARGS,
249+
{"__reduce__", namespace_reduce, METH_NOARGS,
249250
namespace_reduce__doc__},
250251
{"__replace__", _PyCFunction_CAST(namespace_replace), METH_VARARGS|METH_KEYWORDS,
251252
PyDoc_STR("__replace__($self, /, **changes)\n--\n\n"

Objects/odictobject.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1883,8 +1883,9 @@ odictiter_new(PyODictObject *od, int kind)
18831883
/* keys() */
18841884

18851885
static PyObject *
1886-
odictkeys_iter(_PyDictViewObject *dv)
1886+
odictkeys_iter(PyObject *op)
18871887
{
1888+
_PyDictViewObject *dv = (_PyDictViewObject*)op;
18881889
if (dv->dv_dict == NULL) {
18891890
Py_RETURN_NONE;
18901891
}
@@ -1934,7 +1935,7 @@ PyTypeObject PyODictKeys_Type = {
19341935
0, /* tp_clear */
19351936
0, /* tp_richcompare */
19361937
0, /* tp_weaklistoffset */
1937-
(getiterfunc)odictkeys_iter, /* tp_iter */
1938+
odictkeys_iter, /* tp_iter */
19381939
0, /* tp_iternext */
19391940
odictkeys_methods, /* tp_methods */
19401941
0, /* tp_members */
@@ -1951,8 +1952,9 @@ odictkeys_new(PyObject *od, PyObject *Py_UNUSED(ignored))
19511952
/* items() */
19521953

19531954
static PyObject *
1954-
odictitems_iter(_PyDictViewObject *dv)
1955+
odictitems_iter(PyObject *op)
19551956
{
1957+
_PyDictViewObject *dv = (_PyDictViewObject*)op;
19561958
if (dv->dv_dict == NULL) {
19571959
Py_RETURN_NONE;
19581960
}
@@ -2002,7 +2004,7 @@ PyTypeObject PyODictItems_Type = {
20022004
0, /* tp_clear */
20032005
0, /* tp_richcompare */
20042006
0, /* tp_weaklistoffset */
2005-
(getiterfunc)odictitems_iter, /* tp_iter */
2007+
odictitems_iter, /* tp_iter */
20062008
0, /* tp_iternext */
20072009
odictitems_methods, /* tp_methods */
20082010
0, /* tp_members */

Python/Python-tokenize.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,9 @@ _get_col_offsets(tokenizeriterobject *it, struct token token, const char *line_s
239239
}
240240

241241
static PyObject *
242-
tokenizeriter_next(tokenizeriterobject *it)
242+
tokenizeriter_next(PyObject *op)
243243
{
244+
tokenizeriterobject *it = (tokenizeriterobject*)op;
244245
PyObject* result = NULL;
245246

246247
Py_BEGIN_CRITICAL_SECTION(it);
@@ -348,8 +349,9 @@ tokenizeriter_next(tokenizeriterobject *it)
348349
}
349350

350351
static void
351-
tokenizeriter_dealloc(tokenizeriterobject *it)
352+
tokenizeriter_dealloc(PyObject *op)
352353
{
354+
tokenizeriterobject *it = (tokenizeriterobject*)op;
353355
PyTypeObject *tp = Py_TYPE(it);
354356
Py_XDECREF(it->last_line);
355357
_PyTokenizer_Free(it->tok);

0 commit comments

Comments
 (0)