Got rid of Py_FatalError calls.
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 7a8abc4..d229458 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -964,8 +964,5 @@
my_previewProcUPP = NewNavPreviewProc(my_previewProc);
my_filterProcUPP = NewNavObjectFilterProc(my_filterProc);
- /* Check for errors */
- if (PyErr_Occurred())
- Py_FatalError("can't initialize module Nav");
}
diff --git a/Mac/Modules/Printingmodule.c b/Mac/Modules/Printingmodule.c
index 5f1ac57..e0c4017 100644
--- a/Mac/Modules/Printingmodule.c
+++ b/Mac/Modules/Printingmodule.c
@@ -461,8 +461,5 @@
/* XXXX Add constants here */
- /* Check for errors */
- if (PyErr_Occurred())
- Py_FatalError("can't initialize module Printing");
}
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index d373b7e..ec52da4 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -710,11 +710,11 @@
/* Initialize MacOS.Error exception */
MacOS_Error = PyMac_GetOSErrException();
if (MacOS_Error == NULL || PyDict_SetItemString(d, "Error", MacOS_Error) != 0)
- Py_FatalError("can't define MacOS.Error");
+ return;
Rftype.ob_type = &PyType_Type;
Py_INCREF(&Rftype);
if (PyDict_SetItemString(d, "ResourceForkType", (PyObject *)&Rftype) != 0)
- Py_FatalError("can't define MacOS.ResourceForkType");
+ return;
/*
** This is a hack: the following constant added to the id() of a string
** object gives you the address of the data. Unfortunately, it is needed for
@@ -725,10 +725,10 @@
long off = (long)&(p->ob_sval[0]);
if( PyDict_SetItemString(d, "string_id_to_buffer", Py_BuildValue("i", off)) != 0)
- Py_FatalError("Can't define MacOS.string_id_to_buffer");
+ return;
}
if (PyDict_SetItemString(d, "AppearanceCompliant",
Py_BuildValue("i", PyMac_AppearanceCompliant)) != 0)
- Py_FatalError("can't define MacOS.AppearanceCompliant");
+ return;
}
diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index d493574..9364a0b 100644
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -103,7 +103,7 @@
o = QDGA_New();
if (o == NULL || PyDict_SetItemString(d, "qd", o) != 0)
- Py_FatalError("can't initialize Qd.qd");
+ return;
}
"""
diff --git a/Mac/Modules/waste/wastesupport.py b/Mac/Modules/waste/wastesupport.py
index 371ae8b..e2268ee 100644
--- a/Mac/Modules/waste/wastesupport.py
+++ b/Mac/Modules/waste/wastesupport.py
@@ -292,7 +292,7 @@
variablestuff = """
callbackdict = PyDict_New();
if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0)
- Py_FatalError("can't initialize Waste.callbackdict");
+ return;
upp_new_handler = NewWENewObjectProc(my_new_handler);
upp_dispose_handler = NewWEDisposeObjectProc(my_dispose_handler);
upp_draw_handler = NewWEDrawObjectProc(my_draw_handler);