https://github.com/python/cpython/commit/004ce8d97b95c79da51ab0ababa30033bc7f9cbb
commit: 004ce8d97b95c79da51ab0ababa30033bc7f9cbb
branch: main
author: Carlos Sousa <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2026-03-19T16:54:27+05:30
summary:
gh-137696: Rename 'fort' parameter to 'order' in PyBuffer_* functions (#137866)
files:
M Doc/c-api/buffer.rst
M Include/pybuffer.h
M Objects/abstract.c
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index e00b28ca4d7a7e..fe950196297a24 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -500,10 +500,11 @@ Buffer-related functions
*indices* must point to an array of ``view->ndim`` indices.
-.. c:function:: int PyBuffer_FromContiguous(const Py_buffer *view, const void
*buf, Py_ssize_t len, char fort)
+.. c:function:: int PyBuffer_FromContiguous(const Py_buffer *view, const void
*buf, Py_ssize_t len, char order)
Copy contiguous *len* bytes from *buf* to *view*.
- *fort* can be ``'C'`` or ``'F'`` (for C-style or Fortran-style ordering).
+ *order* can be ``'C'`` or ``'F'`` or ``'A'`` (for C-style or Fortran-style
+ ordering or either one).
``0`` is returned on success, ``-1`` on error.
diff --git a/Include/pybuffer.h b/Include/pybuffer.h
index ca1c6058d9052c..6371b9b483777b 100644
--- a/Include/pybuffer.h
+++ b/Include/pybuffer.h
@@ -67,27 +67,27 @@ PyAPI_FUNC(int) PyBuffer_FromContiguous(const Py_buffer
*view, const void *buf,
error (i.e. the object does not have a buffer interface or
it is not working).
- If fort is 'F', then if the object is multi-dimensional,
+ If order is 'F', then if the object is multi-dimensional,
then the data will be copied into the array in
Fortran-style (first dimension varies the fastest). If
- fort is 'C', then the data will be copied into the array
- in C-style (last dimension varies the fastest). If fort
+ order is 'C', then the data will be copied into the array
+ in C-style (last dimension varies the fastest). If order
is 'A', then it does not matter and the copy will be made
in whatever way is more efficient. */
PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
/* Copy the data from the src buffer to the buffer of destination. */
-PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort);
+PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char order);
/*Fill the strides array with byte-strides of a contiguous
- (Fortran-style if fort is 'F' or C-style otherwise)
+ (Fortran-style if order is 'F' or C-style otherwise)
array of the given shape with the given number of bytes
per element. */
PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
Py_ssize_t *shape,
Py_ssize_t *strides,
int itemsize,
- char fort);
+ char order);
/* Fills in a buffer-info structure correctly for an exporter
that can only share a contiguous chunk of memory of
diff --git a/Objects/abstract.c b/Objects/abstract.c
index f2c7de3d1ef1ad..0bbf60840a3346 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -624,7 +624,7 @@ PyBuffer_SizeFromFormat(const char *format)
}
int
-PyBuffer_FromContiguous(const Py_buffer *view, const void *buf, Py_ssize_t
len, char fort)
+PyBuffer_FromContiguous(const Py_buffer *view, const void *buf, Py_ssize_t
len, char order)
{
int k;
void (*addone)(int, Py_ssize_t *, const Py_ssize_t *);
@@ -636,7 +636,7 @@ PyBuffer_FromContiguous(const Py_buffer *view, const void
*buf, Py_ssize_t len,
len = view->len;
}
- if (PyBuffer_IsContiguous(view, fort)) {
+ if (PyBuffer_IsContiguous(view, order)) {
/* simplest copy is all that is needed */
memcpy(view->buf, buf, len);
return 0;
@@ -654,7 +654,7 @@ PyBuffer_FromContiguous(const Py_buffer *view, const void
*buf, Py_ssize_t len,
indices[k] = 0;
}
- if (fort == 'F') {
+ if (order == 'F') {
addone = _Py_add_one_to_index_F;
}
else {
@@ -749,13 +749,13 @@ int PyObject_CopyData(PyObject *dest, PyObject *src)
void
PyBuffer_FillContiguousStrides(int nd, Py_ssize_t *shape,
Py_ssize_t *strides, int itemsize,
- char fort)
+ char order)
{
int k;
Py_ssize_t sd;
sd = itemsize;
- if (fort == 'F') {
+ if (order == 'F') {
for (k=0; k<nd; k++) {
strides[k] = sd;
sd *= shape[k];
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
