Skip to content

Commit 21cf31c

Browse files
committed
Exchange array and size parameters
1 parent 89f91fc commit 21cf31c

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Doc/c-api/tuple.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Tuple Objects
3737
or ``NULL`` with an exception set on failure.
3838
3939
40-
.. c:function:: PyObject* PyTuple_FromArray(PyObject *const *array, Py_ssize_t size)
40+
.. c:function:: PyObject* PyTuple_FromArray(Py_ssize_t size, PyObject *const *array)
4141
4242
Create a tuple of *size* items and copy references from *array* to the new
4343
tuple.

Include/cpython/tupleobject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ PyTuple_SET_ITEM(PyObject *op, Py_ssize_t index, PyObject *value) {
4040
PyTuple_SET_ITEM(_PyObject_CAST(op), (index), _PyObject_CAST(value))
4141

4242
PyAPI_FUNC(PyObject*) PyTuple_FromArray(
43-
PyObject *const *array,
44-
Py_ssize_t size);
43+
Py_ssize_t size,
44+
PyObject *const *array);

Include/internal/pycore_tuple.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ extern PyStatus _PyTuple_InitGlobalObjects(PyInterpreterState *);
2323

2424
#define _PyTuple_ITEMS(op) _Py_RVALUE(_PyTuple_CAST(op)->ob_item)
2525

26-
// Alias for backward compatibility
27-
#define _PyTuple_FromArray PyTuple_FromArray
26+
// Macro for backward compatibility
27+
#define _PyTuple_FromArray(array, size) PyTuple_FromArray((size), (array))
2828

2929
PyAPI_FUNC(PyObject *)_PyTuple_FromStackRefStealOnSuccess(const union _PyStackRef *, Py_ssize_t);
3030
PyAPI_FUNC(PyObject *)_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);

Modules/_testcapi/tuple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ tuple_fromarray(PyObject* Py_UNUSED(module), PyObject *args)
127127
else {
128128
items = NULL;
129129
}
130-
return PyTuple_FromArray(items, size);
130+
return PyTuple_FromArray(size, items);
131131
}
132132

133133

Objects/tupleobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ tuple_item(PyObject *op, Py_ssize_t i)
366366
}
367367

368368
PyObject *
369-
PyTuple_FromArray(PyObject *const *src, Py_ssize_t n)
369+
PyTuple_FromArray(Py_ssize_t n, PyObject *const *src)
370370
{
371371
if (n == 0) {
372372
return tuple_get_empty();

0 commit comments

Comments
 (0)