Merge pull request #16438 from tacaswell/mnt_py310_pt2

MAINT: Catch remaining cases of Py_SIZE and Py_TYPE as lvalues

2 files changed, 4 insertions, 5 deletions

diff --git a/numpy/core/src/multiarray/dtypemeta.c b/numpy/core/src/multiarray/dtypemeta.c
index 76f7b599a..9982cd676 100644
--- a/numpy/core/src/multiarray/dtypemeta.c
+++ b/numpy/core/src/multiarray/dtypemeta.c
@@ -230,7 +230,7 @@ dtypemeta_wrap_legacy_descriptor(PyArray_Descr *descr)
     }
 
     /* Finally, replace the current class of the descr */
-    Py_TYPE(descr) = (PyTypeObject *)dtype_class;
+    Py_SET_TYPE(descr, (PyTypeObject *)dtype_class);
 
     return 0;
 }
@@ -266,4 +266,3 @@ NPY_NO_EXPORT PyTypeObject PyArrayDTypeMeta_Type = {
     .tp_is_gc = dtypemeta_is_gc,
     .tp_traverse = (traverseproc)dtypemeta_traverse,
 };
-
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index ab5076711..84c22ba65 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -2498,9 +2498,9 @@ einsum_list_to_subscripts(PyObject *obj, char *subscripts, int subsize)
                         "subscript is not within the valid range [0, 52)");
                 Py_DECREF(obj);
                 return -1;
-            }              
+            }
         }
-        
+
     }
 
     Py_DECREF(obj);
@@ -4453,7 +4453,7 @@ PyMODINIT_FUNC PyInit__multiarray_umath(void) {
     }
 
     PyArrayDescr_Type.tp_hash = PyArray_DescrHash;
-    Py_TYPE(&PyArrayDescr_Type) = &PyArrayDTypeMeta_Type;
+    Py_SET_TYPE(&PyArrayDescr_Type, &PyArrayDTypeMeta_Type);
     if (PyType_Ready(&PyArrayDescr_Type) < 0) {
         goto err;
     }