New exception interface

jackjansen · jackjansen · commit 55e3927f58b8 · 1997-10-07T21:47:25.000Z
diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c
@@ -606,13 +606,9 @@ initctb()
 	CMCONST("cmStatusListenPend", 0x2000);
 	CMCONST("cmStatusIncomingCallPresent", 0x4000);
 	
-	ErrorObject = PyString_FromString("ctb.error");
+	ErrorObject = PyErr_NewException("ctb.error", NULL, NULL);
 	PyDict_SetItemString(d, "error", ErrorObject);
 	ctbcmtype.ob_type = &PyType_Type;
 	Py_INCREF(&ctbcmtype);
 	PyDict_SetItemString(d, "CTBConnectionMgrType", (PyObject *)&ctbcmtype);
-
-	/* Check for errors */
-	if (PyErr_Occurred())
-		Py_FatalError("can't initialize module ctb");
 }
diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
@@ -979,7 +979,7 @@ initmacfs()
 
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
-	ErrorObject = PyString_FromString("macfs.error");
+	ErrorObject = PyErr_NewException("macfs.error", NULL, NULL);
 	PyDict_SetItemString(d, "error", ErrorObject);
 
 	Mfsatype.ob_type = &PyType_Type;
@@ -992,8 +992,4 @@ initmacfs()
 	Py_INCREF(&Mfsitype);
 	PyDict_SetItemString(d, "FInfoType", (PyObject *)&Mfsitype);
 	/* XXXX Add constants here */
-	
-	/* Check for errors */
-	if (PyErr_Occurred())
-		Py_FatalError("can't initialize module macfs");
 }
diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
@@ -630,7 +630,6 @@ initmac()
 	d = PyModule_GetDict(m);
 	
 	/* Initialize mac.error exception */
-	MacError = PyString_FromString("mac.error");
-	if (MacError == NULL || PyDict_SetItemString(d, "error", MacError) != 0)
-		Py_FatalError("can't define mac.error");
+	MacError = PyErr_NewException("mac.error", NULL, NULL);
+	PyDict_SetItemString(d, "error", MacError);
 }
diff --git a/Mac/Modules/macspeechmodule.c b/Mac/Modules/macspeechmodule.c
@@ -541,10 +541,6 @@ initmacspeech()
 
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
-	ms_error_object = PyString_FromString("macspeech.error");
+	ms_error_object = PyErr_NewException("macspeech.error", NULL, NULL);
 	PyDict_SetItemString(d, "error", ms_error_object);
-
-	/* Check for errors */
-	if (PyErr_Occurred())
-		Py_FatalError("can't initialize module macspeech");
 }

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,6 @@ initmac()`
`630`	`630`	`d = PyModule_GetDict(m);`
`631`	`631`
`632`	`632`	`/* Initialize mac.error exception */`
`633`		`- MacError = PyString_FromString("mac.error");`
`634`		`- if (MacError == NULL \|\| PyDict_SetItemString(d, "error", MacError) != 0)`
`635`		`- Py_FatalError("can't define mac.error");`
	`633`	`+ MacError = PyErr_NewException("mac.error", NULL, NULL);`
	`634`	`+ PyDict_SetItemString(d, "error", MacError);`
`636`	`635`	`}`