_PyObject_GetXIDataWithFallback -> _PyObject_GetXIData

Author: ericsnowcurrently

Include/internal/pycore_crossinterp.h

@@ -163,11 +163,11 @@ PyAPI_FUNC(int) _PyObject_CheckXIData(
         PyThreadState *,
         PyObject *);
 
-PyAPI_FUNC(int) _PyObject_GetXIData(
+PyAPI_FUNC(int) _PyObject_GetXIDataNoFallback(
         PyThreadState *,
         PyObject *,
         _PyXIData_t *);
-PyAPI_FUNC(int) _PyObject_GetXIDataWithFallback(
+PyAPI_FUNC(int) _PyObject_GetXIData(
         PyThreadState *,
         PyObject *,
         xidata_fallback_t,

Modules/_interpchannelsmodule.c

@@ -1779,7 +1779,7 @@ channel_send(_channels *channels, int64_t cid, PyObject *obj,
         PyThread_release_lock(mutex);
         return -1;
     }
-    if (_PyObject_GetXIData(tstate, obj, data) != 0) {
+    if (_PyObject_GetXIDataNoFallback(tstate, obj, data) != 0) {
         PyThread_release_lock(mutex);
         GLOBAL_FREE(data);
         return -1;

Modules/_interpqueuesmodule.c

@@ -1143,7 +1143,7 @@ queue_put(_queues *queues, int64_t qid, PyObject *obj, int fmt, int unboundop)
         _queue_unmark_waiter(queue, queues->mutex);
         return -1;
     }
-    if (_PyObject_GetXIData(tstate, obj, data) != 0) {
+    if (_PyObject_GetXIDataNoFallback(tstate, obj, data) != 0) {
         _queue_unmark_waiter(queue, queues->mutex);
         GLOBAL_FREE(data);
         return -1;

Modules/_testinternalcapi.c

@@ -1970,14 +1970,13 @@ get_crossinterp_data(PyObject *self, PyObject *args, PyObject *kwargs)
         return NULL;
     }
     if (strcmp(mode, "xidata") == 0) {
-        if (_PyObject_GetXIData(tstate, obj, xidata) != 0) {
+        if (_PyObject_GetXIDataNoFallback(tstate, obj, xidata) != 0) {
             goto error;
         }
     }
     else if (strcmp(mode, "fallback") == 0) {
         xidata_fallback_t fallback = _PyXIDATA_FULL_FALLBACK;
-        if (_PyObject_GetXIDataWithFallback(
-                                 tstate, obj, fallback, xidata) != 0)
+        if (_PyObject_GetXIData(tstate, obj, fallback, xidata) != 0)
         {
             goto error;
         }

Python/crossinterp.c

@@ -443,16 +443,16 @@ _get_xidata(PyThreadState *tstate,
 }
 
 int
-_PyObject_GetXIData(PyThreadState *tstate,
-                    PyObject *obj, _PyXIData_t *xidata)
+_PyObject_GetXIDataNoFallback(PyThreadState *tstate,
+                              PyObject *obj, _PyXIData_t *xidata)
 {
     return _get_xidata(tstate, obj, _PyXIDATA_XIDATA_ONLY, xidata);
 }
 
 int
-_PyObject_GetXIDataWithFallback(PyThreadState *tstate,
-                                PyObject *obj, xidata_fallback_t fallback,
-                                _PyXIData_t *xidata)
+_PyObject_GetXIData(PyThreadState *tstate,
+                    PyObject *obj, xidata_fallback_t fallback,
+                    _PyXIData_t *xidata)
 {
     switch (fallback) {
         case _PyXIDATA_XIDATA_ONLY:
@@ -1839,7 +1839,7 @@ _sharednsitem_set_value(_PyXI_namespace_item *item, PyObject *value)
         return -1;
     }
     PyThreadState *tstate = PyThreadState_Get();
-    if (_PyObject_GetXIData(tstate, value, item->xidata) != 0) {
+    if (_PyObject_GetXIDataNoFallback(tstate, value, item->xidata) != 0) {
         PyMem_RawFree(item->xidata);
         item->xidata = NULL;
         // The caller may want to propagate PyExc_NotShareableError

Python/crossinterp_data_lookup.h

@@ -642,8 +642,7 @@ _tuple_shared(PyThreadState *tstate, PyObject *obj, xidata_fallback_t fallback,
 
         int res = -1;
         if (!_Py_EnterRecursiveCallTstate(tstate, " while sharing a tuple")) {
-            res = _PyObject_GetXIDataWithFallback(
-                                    tstate, item, fallback, xidata_i);
+            res = _PyObject_GetXIData(tstate, item, fallback, xidata_i);
             _Py_LeaveRecursiveCallTstate(tstate);
         }
         if (res < 0) {