New exception interface

diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c
index 6eabca96e5f96fd0d5cb5550330b8e4a6f809a2e..bb6fd18d9e047734aae0ca9bcf696b208a2f4dea 100644 (file)
--- 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
index 2c5af1ef01656cd186e47b27bbb49673fd6925ea..2c0c8e1deedad33ebfc17f9eb84467fe862b0530 100644 (file)
--- 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
index 49c0f8b34ef5e12530fa318ed747b3ce67334cb9..a7f958e0dd0409951ac8659fdbfa98745aaf6247 100644 (file)
--- 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
index 22fe99a6a22fc737833d77af4183e0bf425a8ccc..d0ee465e443d65807e046de2951f5c600901aa30 100644 (file)
--- 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");
 }