Simplify pointer_bits handling

Author: zklaus

Doc/library/sys.rst

@@ -18,10 +18,7 @@ always available. Unless explicitly noted otherwise, all variables are read-only
    .. attribute:: abi_info.pointer_bits
 
       The width of pointers in bits, as an integer.
-
-      * ``32``: 32-bit build
-      * ``64``: 64-bit build
-      * ``None`` if this information is unknown or neither 32 nore 64 bits.
+      Equivalent to ``8 * sizeof(void *)``, i.e. usually ``32`` or ``64``.
 
    .. attribute:: abi_info.Py_GIL_DISABLED
 

Python/abiinfo.c

@@ -25,27 +25,6 @@ static PyStructSequence_Desc abi_info_desc = {
     3
 };
 
-PyObject *
-_PyAbiInfo_GetPointerBits(void)
-{
-    PyObject *pointer_bits;
-    switch (SIZEOF_VOID_P) {
-        case 4:
-            pointer_bits = PyLong_FromLong(32);
-            break;
-        case 8:
-            pointer_bits = PyLong_FromLong(64);
-            break;
-        default:
-            pointer_bits = Py_NewRef(Py_None);
-            break;
-    }
-    if (pointer_bits == NULL) {
-        return NULL;
-    }
-    return pointer_bits;
-}
-
 PyObject *
 PyAbiInfo_GetInfo(void)
 {
@@ -56,7 +35,7 @@ PyAbiInfo_GetInfo(void)
         goto error;
     }
 
-    value = _PyAbiInfo_GetPointerBits();
+    value = PyLong_FromLong(sizeof(void *) * 8);
     if (value == NULL) {
         goto error;
     }