mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Don't repeat yourself

Browse source 
Added the macros PyModule_AddIntMacro and PyModule_AddStringMacro. They shorten PyModule_AddIntConstant(m, "AF_INET", AF_INET) to PyModule_AddIntMacro(m, AF_INET)
This commit is contained in:
Christian Heimes 2008-01-22 15:25:18 +00:00
parent 690c91220e
commit 74b8e76ec1
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Doc/c-api/module.rst
View file

@ -18,7 +18,7 @@ There are only a few functions special to module objects.
is exposed to Python programs as ``types.ModuleType``. is exposed to Python programs as ``types.ModuleType``.
.. cfunction:: int PyModule_Check(PyObject *p) .. cmacro:: int PyModule_Check(PyObject *p)
Return true if *p* is a module object, or a subtype of a module object. Return true if *p* is a module object, or a subtype of a module object.
@ -26,7 +26,7 @@ There are only a few functions special to module objects.
Allowed subtypes to be accepted. Allowed subtypes to be accepted.
.. cfunction:: int PyModule_CheckExact(PyObject *p) .. cmacro:: int PyModule_CheckExact(PyObject *p)
Return true if *p* is a module object, but not a subtype of Return true if *p* is a module object, but not a subtype of
:cdata:`PyModule_Type`. :cdata:`PyModule_Type`.
@ -103,3 +103,19 @@ There are only a few functions special to module objects.
null-terminated. Return ``-1`` on error, ``0`` on success. null-terminated. Return ``-1`` on error, ``0`` on success.
.. versionadded:: 2.0 .. versionadded:: 2.0
.. cmacro:: int PyModule_AddIntMacro(PyObject *module, macro)
Add an int constant to *module*. The name and the value are taken from
*macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int
constant *AF_INET* with the value of *AF_INET* to *module*.
Return ``-1`` on error, ``0`` on success.
.. versionadded:: 2.6
.. cmacro:: int PyModule_AddStringMacro(PyObject *module, macro)
Add a string constant to *module*.
.. versionadded:: 2.6

3
Include/modsupport.h
View file

@ -40,7 +40,8 @@ PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
#define PYTHON_API_VERSION 1013 #define PYTHON_API_VERSION 1013
#define PYTHON_API_STRING "1013" #define PYTHON_API_STRING "1013"