[Zope-Checkins] CVS: Zope2 - SetTemplate.c:1.6.2.7

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv869

Modified Files:
      Tag: Catalog-BTrees-Integration
	SetTemplate.c 
Log Message:
added conflict resolution.



--- Updated File SetTemplate.c in package Zope2 --
--- SetTemplate.c	2001/03/12 17:30:48	1.6.2.6
+++ SetTemplate.c	2001/03/14 14:55:52	1.6.2.7
@@ -150,7 +150,7 @@
   KEY_TYPE *keys;
   VALUE_TYPE *values;
 
-  UNLESS (PyArg_ParseTuple(args, "O|O!", &items, self->ob_type, &next))
+  UNLESS (PyArg_ParseTuple(args, "O|O", &items, &next))
     return -1;
 
   if ((l=PyTuple_Size(items)) < 0) return -1;
@@ -227,6 +227,8 @@
    "minKey([key]) -- Fine the minimum key\n\n"
    "If an argument is given, find the minimum >= the argument"},
 #ifdef PERSISTENT
+  {"_p_resolveConflict", (PyCFunction) bucket__p_resolveConflict, METH_VARARGS,
+   "_p_resolveConflict() -- Reinitialize from a newly created copy"},
   {"_p_deactivate", (PyCFunction) bucket__p_deactivate, METH_VARARGS,
    "_p_deactivate() -- Reinitialize from a newly created copy"},
 #endif