[Zodb-checkins] CVS: StandaloneZODB/BTrees - BTreeModuleTemplate.c:1.16

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/BTrees
In directory cvs.zope.org:/tmp/cvs-serv26864

Modified Files:
	BTreeModuleTemplate.c 
Log Message:
Merge Standby-branch to trunk (mostly).

The Standby-branch was branched from the StandaloneZODB-1_0-branch,
which includes the BTrees-fsIndex code.  I didn't include that change
in the merge, but everything else.  Terse summary follows:

BTreeModuleTemplate.c:
    Greg Ward's ConflictError patch



=== StandaloneZODB/BTrees/BTreeModuleTemplate.c 1.15 => 1.16 ===
 
   if (m != NULL) {
-  	c = PyObject_GetAttrString(m,"ConflictError");
+  	c = PyObject_GetAttrString(m, "BTreesConflictError");
   	if (c != NULL) 
   		ConflictError = c;
 	Py_DECREF(m);	
@@ -362,8 +362,4 @@
   PyExtensionClass_Export(d,MOD_NAME_PREFIX "BTree", BTreeType);
   PyExtensionClass_Export(d,MOD_NAME_PREFIX "Set", SetType);
   PyExtensionClass_Export(d,MOD_NAME_PREFIX "TreeSet", TreeSetType);
- 
-  /* Check for errors */
-  if (PyErr_Occurred())
-    Py_FatalError("can't initialize module " MOD_NAME_PREFIX "BTree");
 }