bpo-42376: New C-APIs to simplify module attribute declaration

tiran · Nov 14, 2020 · Nov 15, 2020 · Nov 15, 2020 · Nov 16, 2020 · Nov 16, 2020
commit bb41d82e4e9e2a88157bf148e97cd3fa364a795f
@@ -571,7 +571,7 @@ state:
 
    .. versionadded:: 3.9
 
-.. c:function:: PyTypeeObject * PyModule_AddNewTypeFromSpec(PyObject *module, PyType_Spec *spec, PyObject *base)
+.. c:function:: PyTypeObject * PyModule_AddNewTypeFromSpec(PyObject *module, PyType_Spec *spec, PyObject *base)
 
    Initialize a new type and add it to *module*.
    The function is equivalent to :c:func:`PyType_FromModuleAndSpec` followed
@@ -652,7 +652,7 @@ state:
 
       Attribute type.
 
-   .. c:member:: union value
+   .. c:member:: void *value
 
       Value of the module constant definition, whose meaning depends on
       *type*.
-   The values for *type* and the definition of the *value* union are
-   internal implementation details. Use any of the ``PyModuleConst_`` macros
-   to define entries. The array must be terminated by an entry with name
-   set to ``NULL``.
-
-   .. c:member:: const char *name
-
-      Attribute name.
-
-   .. c:member:: int type
-
-      Attribute type.
-
-   .. c:member:: void *value
-
-      Value of the module constant definition, whose meaning depends on
-      *type*.
+   Definition of a module constant.
+
+   The members of this struct are internal implementation details.
+   To define entries, use only the ``PyModuleConst_`` macros below,
+   and ``{NULL}`` to mark the end of the array.
-   The values for *type* and the definition of the *value* union are
-   internal implementation details. Use any of the ``PyModuleConst_`` macros
-   to define entries. The array must be terminated by an entry with name
-   set to ``NULL``.
-
-   .. c:member:: const char *name
-
-      Attribute name.
-
-   .. c:member:: int type
-
-      Attribute type.
-
-   .. c:member:: void *value
-
-      Value of the module constant definition, whose meaning depends on
-      *type*.
+   Definition of a module constant.
+
+   The members of this struct are internal implementation details.
+   To define entries, use only the ``PyModuleConst_`` macros below,
+   and ``{NULL}`` to mark the end of the array.

diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
@@ -1325,6 +1325,10 @@ PyMethod_New:PyObject*:class:0:
 PyMethod_Self:PyObject*::0:
 PyMethod_Self:PyObject*:im:0:
 
+PyModule_AddConstants:int:::
+PyModule_AddConstants:PyObject*:module:0:
+PyModule_AddConstants:PyModuleConst_Def*:def::
+
 PyModule_AddFunctions:int:::
 PyModule_AddFunctions:PyObject*:module:0:
 PyModule_AddFunctions:PyMethodDef*:functions::
@@ -1343,6 +1347,18 @@ PyModule_AddObject:PyObject*:module:0:
 PyModule_AddObject:const char*:name::
 PyModule_AddObject:PyObject*:value:+1:
 
+PyModule_AddNewException:PyObject*::+1:
+PyModule_AddNewException:PyObject*:module:0:
+PyModule_AddNewException:const char*:name::
+PyModule_AddNewException:const char*:doc::
+PyModule_AddNewException:PyObject*:base:0:
+PyModule_AddNewException:PyObject*:dict:0:
+
+PyModule_AddNewTypeFromSpec:PyObject*::+1:
+PyModule_AddNewTypeFromSpec:PyObject*:module:0:
+PyModule_AddNewTypeFromSpec:PyType_spec*:spec::
+PyModule_AddNewTypeFromSpec:PyObject*:base:0:
+
 PyModule_AddStringConstant:int:::
 PyModule_AddStringConstant:PyObject*:module:0:
 PyModule_AddStringConstant:const char*:name::

diff --git a/Misc/NEWS.d/next/C API/2020-11-16-20-29-59.bpo-42376.vO9Tvu.rst b/Misc/NEWS.d/next/C API/2020-11-16-20-29-59.bpo-42376.vO9Tvu.rst
@@ -0,0 +1,3 @@
+Add new functions :c:func:`PyModule_AddConstants`,
+:c:func:`PyModule_AddNewTypeFromSpec`, :c:func:`PyModule_AddNewException` to
+simplify the declaration of attribute in modules.