mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use PyModule_GetDict(). 

Clean up the example of exporting a C-callable API from an extension module.
Add a hyperlink to a related section in the Python/C API reference.
This commit is contained in:
Fred Drake 2002-04-12 19:08:31 +00:00
parent e77e5ef2af
commit 63e40a598d
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Doc/ext/extending.tex
View File

@ -217,12 +217,13 @@ the error checking for now):
void void
initspam(void) initspam(void)
{ {
PyObject *m, *d; PyObject *m;
m = Py_InitModule("spam", SpamMethods); m = Py_InitModule("spam", SpamMethods);
d = PyModule_GetDict(m);
SpamError = PyErr_NewException("spam.error", NULL, NULL); SpamError = PyErr_NewException("spam.error", NULL, NULL);
PyDict_SetItemString(d, "error", SpamError); Py_INCREF(SpamError);
PyModule_AddObject(m, "error", SpamError);
} }
\end{verbatim} \end{verbatim}
@ -1277,13 +1278,8 @@ initspam(void)
/* Create a CObject containing the API pointer array's address */ /* Create a CObject containing the API pointer array's address */
c_api_object = PyCObject_FromVoidPtr((void *)PySpam_API, NULL); c_api_object = PyCObject_FromVoidPtr((void *)PySpam_API, NULL);
if (c_api_object != NULL) { if (c_api_object != NULL)
/* Create a name for this object in the module's namespace */ PyModule_AddObject(m, "_C_API", c_api_object);
PyObject *d = PyModule_GetDict(m);
PyDict_SetItemString(d, "_C_API", c_api_object);
Py_DECREF(c_api_object);
}
} }
\end{verbatim} \end{verbatim}
@ -1324,16 +1320,21 @@ static void **PySpam_API;
#define PySpam_System \ #define PySpam_System \
(*(PySpam_System_RETURN (*)PySpam_System_PROTO) PySpam_API[PySpam_System_NUM]) (*(PySpam_System_RETURN (*)PySpam_System_PROTO) PySpam_API[PySpam_System_NUM])
#define import_spam() \ /* Return -1 and set exception on error, 0 on success. */
{ \ static int
PyObject *module = PyImport_ImportModule("spam"); \ import_spam(void)
if (module != NULL) { \ {
PyObject *module_dict = PyModule_GetDict(module); \ PyObject *module = PyImport_ImportModule("spam");
PyObject *c_api_object = PyDict_GetItemString(module_dict, "_C_API"); \
if (PyCObject_Check(c_api_object)) { \ if (module != NULL) {
PySpam_API = (void **)PyCObject_AsVoidPtr(c_api_object); \ PyObject *c_api_object = PyObject_GetAttrString(module, "_C_API");
} \ if (c_api_object == NULL)
} \ return -1;
if (PyCObject_Check(c_api_object))
PySpam_API = (void **)PyCObject_AsVoidPtr(c_api_object);
Py_DECREF(c_api_object);
}
return 0;
} }
#endif #endif
@ -1357,7 +1358,9 @@ initclient(void)
PyObject *m; PyObject *m;
Py_InitModule("client", ClientMethods); Py_InitModule("client", ClientMethods);
import_spam(); if (import_spam() < 0)
return;
/* additional initialization can happen here */
} }
\end{verbatim} \end{verbatim}
@ -1370,6 +1373,7 @@ Finally it should be mentioned that CObjects offer additional
functionality, which is especially useful for memory allocation and functionality, which is especially useful for memory allocation and
deallocation of the pointer stored in a CObject. The details deallocation of the pointer stored in a CObject. The details
are described in the \citetitle[../api/api.html]{Python/C API are described in the \citetitle[../api/api.html]{Python/C API
Reference Manual} in the section ``CObjects'' and in the Reference Manual} in the section
implementation of CObjects (files \file{Include/cobject.h} and ``\ulink{CObjects}{../api/cObjects.html}'' and in the implementation
of CObjects (files \file{Include/cobject.h} and
\file{Objects/cobject.c} in the Python source code distribution). \file{Objects/cobject.c} in the Python source code distribution).