Make abi_info object a simple namespace with no explicit C API

Author: zklaus

Doc/library/sys.rst

@@ -13,22 +13,18 @@ always available. Unless explicitly noted otherwise, all variables are read-only
 
 .. data:: abi_info
 
-   A :term:`named tuple` holding information about the ABI of the interpreter.
+   An object containing information about the ABI of the currently running
+   Python interpreter.  The following attributes are available in cpython:
 
-   .. attribute:: abi_info.pointer_bits
+   *pointer_bits* is the width of pointers in bits, as an integer, equivalent
+   to ``8 * sizeof(void *)``, i.e. usually ``32`` or ``64``.
 
-      The width of pointers in bits, as an integer.
-      Equivalent to ``8 * sizeof(void *)``, i.e. usually ``32`` or ``64``.
+   *Py_GIL_DISABLED* is a boolean indicating whether the interpreter was built
+   with the GIL disabled, i.e. with the :option:`--disable-gil` option,
+   aka free-threading.
 
-   .. attribute:: abi_info.Py_GIL_DISABLED
-
-      A boolean indicating whether the interpreter was built in with the GIL
-      disabled, i.e. with the :option:`--disable-gil` option, aka free-threading.
-
-   .. attribute:: abi_info.Py_DEBUG
-
-      A boolean indicating whether the interpreter was built in debug mode,
-      i.e. with the :option:`--with-pydebug` option.
+   *Py_DEBUG* is a boolean indicating whether the interpreter was built in
+   debug mode, i.e. with the :option:`--with-pydebug` option.
 
    .. versionadded:: next
 

Include/internal/pycore_abiinfo.h

@@ -423,7 +423,6 @@ PYTHON_OBJS=	\
 		Python/_warnings.o \
 		Python/Python-ast.o \
 		Python/Python-tokenize.o \
-		Python/abiinfo.o \
 		Python/asdl.o \
 		Python/assemble.o \
 		Python/ast.o \

Makefile.pre.in

@@ -188,7 +188,6 @@
     <ClCompile Include="..\PC\msvcrtmodule.c" />
     <ClCompile Include="..\PC\winreg.c" />
     <ClCompile Include="..\Python\_warnings.c" />
-    <ClCompile Include="..\Python\abiinfo.c" />
     <ClCompile Include="..\Python\asdl.c" />
     <ClCompile Include="..\Python\assemble.c" />
     <ClCompile Include="..\Python\ast.c" />

PCbuild/_freeze_module.vcxproj

@@ -25,9 +25,6 @@
     <ClCompile Include="..\Objects\abstract.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Python\abiinfo.c">
-      <Filter>Python</Filter>
-    </ClCompile>
     <ClCompile Include="..\Python\asdl.c">
       <Filter>Source Files</Filter>
     </ClCompile>

PCbuild/_freeze_module.vcxproj.filters

@@ -582,7 +582,6 @@
     <ClCompile Include="..\Python\pyhash.c" />
     <ClCompile Include="..\Python\_contextvars.c" />
     <ClCompile Include="..\Python\_warnings.c" />
-    <ClCompile Include="..\Python\abiinfo.c" />
     <ClCompile Include="..\Python\asdl.c" />
     <ClCompile Include="..\Python\assemble.c" />
     <ClCompile Include="..\Python\ast.c" />

PCbuild/pythoncore.vcxproj

@@ -1316,9 +1316,6 @@
     <ClCompile Include="..\Python\_warnings.c">
       <Filter>Python</Filter>
     </ClCompile>
-    <ClCompile Include="..\Python\abiinfo.c">
-      <Filter>Python</Filter>
-    </ClCompile>
     <ClCompile Include="..\Python\asdl.c">
       <Filter>Python</Filter>
     </ClCompile>

PCbuild/pythoncore.vcxproj.filters

@@ -1,7 +1,6 @@
 /* Python interpreter top-level routines, including init/exit */
 
 #include "Python.h"
-#include "pycore_abiinfo.h"       // _PyAbiInfo_InitTypes()
 #include "pycore_audit.h"         // _PySys_ClearAuditHooks()
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_ceval.h"         // _PyEval_FiniGIL()
@@ -712,11 +711,6 @@ pycore_init_types(PyInterpreterState *interp)
         return status;
     }
 
-    status = _PyAbiInfo_InitTypes(interp);
-    if (_PyStatus_EXCEPTION(status)) {
-        return status;
-    }
-
     status = _PyLong_InitTypes(interp);
     if (_PyStatus_EXCEPTION(status)) {
         return status;
@@ -1866,7 +1860,6 @@ static void
 finalize_interp_types(PyInterpreterState *interp)
 {
     _PyTypes_FiniExtTypes(interp);
-    _PyAbiInfo_FiniTypes(interp);
     _PyUnicode_FiniTypes(interp);
     _PySys_FiniTypes(interp);
     _PyXI_FiniTypes(interp);

Python/abiinfo.c

@@ -15,7 +15,6 @@ Data members:
 */
 
 #include "Python.h"
-#include "pycore_abiinfo.h"       // _PyAbiInfo_GetInfo()
 #include "pycore_audit.h"         // _Py_AuditHookEntry
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_ceval.h"         // _PyEval_SetAsyncGenFinalizer()
@@ -3632,6 +3631,56 @@ make_impl_info(PyObject *version_info)
     return NULL;
 }
 
+
+PyObject *
+make_abi_info(void)
+{
+    int res;
+    PyObject *abi_info, *value, *ns;
+    abi_info = PyDict_New();
+    if (abi_info == NULL) {
+        goto error;
+    }
+
+    value = PyLong_FromLong(sizeof(void *) * 8);
+    if (value == NULL) {
+        goto error;
+    }
+    res = PyDict_SetItemString(abi_info, "pointer_bits", value);
+    Py_DECREF(value);
+    if (res < 0) {
+        goto error;
+    }
+
+#ifdef Py_GIL_DISABLED
+    value = Py_True;
+#else
+    value = Py_False;
+#endif
+    res = PyDict_SetItemString(abi_info, "Py_GIL_DISABLED", value);
+    if (res < 0) {
+        goto error;
+    }
+
+#ifdef Py_DEBUG
+    value = Py_True;
+#else
+    value = Py_False;
+#endif
+    res = PyDict_SetItemString(abi_info, "Py_DEBUG", value);
+    if (res < 0) {
+        goto error;
+    }
+
+    ns = _PyNamespace_New(abi_info);
+    Py_DECREF(abi_info);
+    return ns;
+
+error:
+    Py_CLEAR(abi_info);
+    return NULL;
+}
+
 #ifdef __EMSCRIPTEN__
 
 PyDoc_STRVAR(emscripten_info__doc__,
@@ -3857,7 +3906,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
 
     SET_SYS("thread_info", PyThread_GetInfo());
 
-    SET_SYS("abi_info", _PyAbiInfo_GetInfo());
+    SET_SYS("abi_info", make_abi_info());
 
     /* initialize asyncgen_hooks */
     if (_PyStructSequence_InitBuiltin(interp, &AsyncGenHooksType,