[Zodb-checkins] CVS: Zope/lib/Components/ExtensionClass/src - Acquisition.h:1.2

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/Components/ExtensionClass/src
In directory cvs.zope.org:/tmp/cvs-serv23442/lib/Components/ExtensionClass/src

Modified Files:
	Acquisition.h 
Log Message:
- Merged cAccessControl-review-branch.

- Made some corrections to the DTML tests, which aren't currently working
in testrunner but work when run directly. ??  


=== Zope/lib/Components/ExtensionClass/src/Acquisition.h 1.1 => 1.2 ===
 
 #define aq_init() { \
-	PyObject *module; \
-	PyObject *api; \
-	if ((module = PyImport_ImportModule("Acquisition")) == NULL) \
-		Py_FatalError("Acquisition CAPI failed to load Acquisition"); \
-	if ((api = PyObject_GetAttrString(module,"AcquisitionCAPI")) \
-		== NULL) Py_FatalError("Acquisition CAPI failed to load AcquistionCAPI"); \
-	Py_DECREF(module); \
-	AcquisitionCAPI = PyCObject_AsVoidPtr(api); \
-	Py_DECREF(api); \
+    PyObject *module; \
+    PyObject *api; \
+    if (! (module = PyImport_ImportModule("Acquisition"))) return; \
+    if (! (api = PyObject_GetAttrString(module,"AcquisitionCAPI"))) return; \
+    Py_DECREF(module); \
+    AcquisitionCAPI = PyCObject_AsVoidPtr(api); \
+    Py_DECREF(api); \
 }