return the module object from PyMODINIT_FUNC

benjaminp · benjaminp · commit 71e30a0438dc · 2008-12-24T16:27:25.000Z
diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
@@ -326,8 +326,8 @@ only non-\ ``static`` item defined in the module file::
        return PyModule_Create(&spammodule);
    }
 
-Note that PyMODINIT_FUNC declares the function as ``void`` return type,
-declares any special linkage declarations required by the platform, and for  C++
+Note that PyMODINIT_FUNC declares the function as ``PyObject *`` return type,
+declares any special linkage declarations required by the platform, and for C++
 declares the function as ``extern "C"``.
 
 When the Python program imports module :mod:`spam` for the first time,
diff --git a/Doc/includes/noddy.c b/Doc/includes/noddy.c
@@ -52,4 +52,5 @@ PyInit_noddy(void)
 
     Py_INCREF(&noddy_NoddyType);
     PyModule_AddObject(m, "Noddy", (PyObject *)&noddy_NoddyType);
+    return m;
 }
diff --git a/Doc/includes/noddy2.c b/Doc/includes/noddy2.c
@@ -186,4 +186,5 @@ PyInit_noddy2(void)
 
     Py_INCREF(&NoddyType);
     PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);
+    return m;
 }
diff --git a/Doc/includes/noddy3.c b/Doc/includes/noddy3.c
@@ -239,4 +239,5 @@ PyInit_noddy3(void)
 
     Py_INCREF(&NoddyType);
     PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);
+    return m;
 }
diff --git a/Doc/includes/noddy4.c b/Doc/includes/noddy4.c
@@ -221,4 +221,5 @@ PyInit_noddy4(void)
 
     Py_INCREF(&NoddyType);
     PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);
+    return m;
 }

Original file line number	Diff line number	Diff line change
@@ -326,8 +326,8 @@ only non-\ ``static`` item defined in the module file::
`326`	`326`	`return PyModule_Create(&spammodule);`
`327`	`327`	`}`
`328`	`328`
`329`		-Note that PyMODINIT_FUNC declares the function as ``void`` return type,
`330`		`-declares any special linkage declarations required by the platform, and for C++`
	`329`	+Note that PyMODINIT_FUNC declares the function as ``PyObject *`` return type,
	`330`	`+declares any special linkage declarations required by the platform, and for C++`
`331`	`331`	declares the function as ``extern "C"``.
`332`	`332`
`333`	`333`	When the Python program imports module :mod:`spam` for the first time,
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,5 @@ PyInit_noddy(void)`
`52`	`52`
`53`	`53`	`Py_INCREF(&noddy_NoddyType);`
`54`	`54`	`PyModule_AddObject(m, "Noddy", (PyObject *)&noddy_NoddyType);`
	`55`	`+ return m;`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,5 @@ PyInit_noddy2(void)`
`186`	`186`
`187`	`187`	`Py_INCREF(&NoddyType);`
`188`	`188`	`PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);`
	`189`	`+ return m;`
`189`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,4 +239,5 @@ PyInit_noddy3(void)`
`239`	`239`
`240`	`240`	`Py_INCREF(&NoddyType);`
`241`	`241`	`PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);`
	`242`	`+ return m;`
`242`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,4 +221,5 @@ PyInit_noddy4(void)`
`221`	`221`
`222`	`222`	`Py_INCREF(&NoddyType);`
`223`	`223`	`PyModule_AddObject(m, "Noddy", (PyObject *)&NoddyType);`
	`224`	`+ return m;`
`224`	`225`	`}`