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/nismodule.c b/Modules/nismodule.c
index 586602699a..cadbad0595 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -370,8 +370,7 @@ initnis ()
 	PyObject *m, *d;
 	m = Py_InitModule("nis", nis_methods);
 	d = PyModule_GetDict(m);
-	NisError = PyString_FromString("nis.error");
-	if (NisError == NULL ||
-	    PyDict_SetItemString(d, "error", NisError) != 0)
-		Py_FatalError("Cannot define nis.error");
+	NisError = PyErr_NewException("nis.error", NULL, NULL);
+	if (NisError != NULL)
+		PyDict_SetItemString(d, "error", NisError);
 }