Apply two changes, systematically:

(1) Use PyErr_NewException("module.class", NULL, NULL) to create the
    exception object.

(2) Remove all calls to Py_FatalError(); instead, return or
    ignore the errors -- the import code now checks PyErr_Occurred()
    after calling a module's init function, so it's no longer a
    fatal error for the initialization to fail.

Also did some small cleanups, e.g. removed unnecessary test for
"already initialized" from initfpectl(), and unified
initposix()/initnt().

I haven't checked this very thoroughly, so while the changes are
pretty trivial -- beware of untested code!

1 files changed, 3 insertions, 4 deletions

diff --git a/Modules/audioop.c b/Modules/audioop.c
index fc33bcd..c6d9df5 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1396,8 +1396,7 @@ initaudioop()
 	PyObject *m, *d;
 	m = Py_InitModule("audioop", audioop_methods);
 	d = PyModule_GetDict(m);
-	AudioopError = PyString_FromString("audioop.error");
-	if ( AudioopError == NULL
-	     || PyDict_SetItemString(d,"error",AudioopError) )
-		Py_FatalError("can't define audioop.error");
+	AudioopError = PyErr_NewException("audioop.error", NULL, NULL);
+	if (AudioopError != NULL)
+	     PyDict_SetItemString(d,"error",AudioopError);
 }