summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-02 19:20:26 (GMT)
committerGeorg Brandl <georg@python.org>2009-01-02 19:20:26 (GMT)
commit574b1279d974b45064492ec53e7dd0a81a4ef0e0 (patch)
tree60abb20e8b8ff87fafa51f564417ca034046c014
parentaa672ebe49cbb58a2c8b384955af7b5c792801af (diff)
downloadcpython-574b1279d974b45064492ec53e7dd0a81a4ef0e0.zip
cpython-574b1279d974b45064492ec53e7dd0a81a4ef0e0.tar.gz
cpython-574b1279d974b45064492ec53e7dd0a81a4ef0e0.tar.bz2
Remove traces of Py_InitModule*.
-rw-r--r--Objects/moduleobject.c4
-rw-r--r--PC/example_nt/example.c16
2 files changed, 16 insertions, 4 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 7f81ce4..9c705b8 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -91,9 +91,9 @@ PyModule_Create2(struct PyModuleDef* module, int module_api_version)
This is a bit of a hack: when the shared library is loaded,
the module name is "package.module", but the module calls
- Py_InitModule*() with just "module" for the name. The shared
+ PyModule_Create*() with just "module" for the name. The shared
library loader squirrels away the true name of the module in
- _Py_PackageContext, and Py_InitModule*() will substitute this
+ _Py_PackageContext, and PyModule_Create*() will substitute this
(if the name actually matches).
*/
if (_Py_PackageContext != NULL) {
diff --git a/PC/example_nt/example.c b/PC/example_nt/example.c
index 953fb82..d807311 100644
--- a/PC/example_nt/example.c
+++ b/PC/example_nt/example.c
@@ -13,8 +13,20 @@ static PyMethodDef example_methods[] = {
{NULL, NULL}
};
+static struct PyModuleDef examplemodule = {
+ PyModuleDef_HEAD_INIT,
+ "example",
+ "example module doc string",
+ -1,
+ example_methods,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+};
+
PyMODINIT_FUNC
-initexample(void)
+PyInit_example(void)
{
- Py_InitModule("example", example_methods);
+ return PyModule_Create(&examplemodule);
}