[Zodb-checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.71.10.1 BucketTemplate.c:1.47.10.1 SetTemplate.c:1.15.68.1 TreeSetTemplate.c:1.14.10.1 convert.py:1.6.6.1

[Jeremy Hylton]

Update of /cvs-repository/Zope/lib/python/BTrees
In directory cvs.zope.org:/tmp/cvs-serv27252/lib/python/BTrees

Modified Files:
      Tag: Zope-2_6-branch
	BTreeTemplate.c BucketTemplate.c SetTemplate.c 
	TreeSetTemplate.c convert.py 
Log Message:
Sync Zope 2.6 and ZODB 3.1 release branches.

ZODB deadlock prevention code.
Bug in ConflictResolution bad_classes handling.
Don't let exceptions propagate out of ConflictResolution.
Add data_txn atribute to records returned by storage iterators.
Other sundry changes.



=== Zope/lib/python/BTrees/BTreeTemplate.c 1.71 => 1.71.10.1 ===
--- Zope/lib/python/BTrees/BTreeTemplate.c:1.71	Fri Jun 28 16:52:30 2002
+++ Zope/lib/python/BTrees/BTreeTemplate.c	Tue Nov 12 16:13:57 2002
@@ -1618,10 +1618,10 @@
    "Return the default (or None) if the key is not found."
   },
   {"maxKey", (PyCFunction) BTree_maxKey,	METH_VARARGS,
-   "maxKey([key]) -- Fine the maximum key\n\n"
+   "maxKey([key]) -- Find the maximum key\n\n"
    "If an argument is given, find the maximum <= the argument"},
   {"minKey", (PyCFunction) BTree_minKey,	METH_VARARGS,
-   "minKey([key]) -- Fine the minimum key\n\n"
+   "minKey([key]) -- Find the minimum key\n\n"
    "If an argument is given, find the minimum >= the argument"},
   {"clear",	(PyCFunction) BTree_clear,	METH_VARARGS,
    "clear() -- Remove all of the items from the BTree"},


=== Zope/lib/python/BTrees/BucketTemplate.c 1.47 => 1.47.10.1 ===
--- Zope/lib/python/BTrees/BucketTemplate.c:1.47	Thu Jun 27 18:09:32 2002
+++ Zope/lib/python/BTrees/BucketTemplate.c	Tue Nov 12 16:13:57 2002
@@ -1305,10 +1305,10 @@
   {"__init__",	(PyCFunction) Mapping_update,	METH_VARARGS,
    "__init__(collection) -- Initialize with items from the given collection"},
   {"maxKey", (PyCFunction) Bucket_maxKey,	METH_VARARGS,
-   "maxKey([key]) -- Fine the maximum key\n\n"
+   "maxKey([key]) -- Find the maximum key\n\n"
    "If an argument is given, find the maximum <= the argument"},
   {"minKey", (PyCFunction) Bucket_minKey,	METH_VARARGS,
-   "minKey([key]) -- Fine the minimum key\n\n"
+   "minKey([key]) -- Find the minimum key\n\n"
    "If an argument is given, find the minimum >= the argument"},
   {"values",	(PyCFunction) bucket_values,	METH_VARARGS,
      "values([min, max]) -- Return the values"},


=== Zope/lib/python/BTrees/SetTemplate.c 1.15 => 1.15.68.1 ===
--- Zope/lib/python/BTrees/SetTemplate.c:1.15	Thu Feb 21 16:41:17 2002
+++ Zope/lib/python/BTrees/SetTemplate.c	Tue Nov 12 16:13:57 2002
@@ -152,10 +152,10 @@
   {"clear",	(PyCFunction) bucket_clear,	METH_VARARGS,
    "clear() -- Remove all of the items from the bucket"},
   {"maxKey", (PyCFunction) Bucket_maxKey,	METH_VARARGS,
-   "maxKey([key]) -- Fine the maximum key\n\n"
+   "maxKey([key]) -- Find the maximum key\n\n"
    "If an argument is given, find the maximum <= the argument"},
   {"minKey", (PyCFunction) Bucket_minKey,	METH_VARARGS,
-   "minKey([key]) -- Fine the minimum key\n\n"
+   "minKey([key]) -- Find 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,


=== Zope/lib/python/BTrees/TreeSetTemplate.c 1.14 => 1.14.10.1 ===
--- Zope/lib/python/BTrees/TreeSetTemplate.c:1.14	Wed Jun 19 19:44:20 2002
+++ Zope/lib/python/BTrees/TreeSetTemplate.c	Tue Nov 12 16:13:57 2002
@@ -99,10 +99,10 @@
   {"keys",	(PyCFunction) BTree_keys,	METH_VARARGS,
      "keys() -- Return the keys"},
   {"maxKey", (PyCFunction) BTree_maxKey,	METH_VARARGS,
-   "maxKey([key]) -- Fine the maximum key\n\n"
+   "maxKey([key]) -- Find the maximum key\n\n"
    "If an argument is given, find the maximum <= the argument"},
   {"minKey", (PyCFunction) BTree_minKey,	METH_VARARGS,
-   "minKey([key]) -- Fine the minimum key\n\n"
+   "minKey([key]) -- Find the minimum key\n\n"
    "If an argument is given, find the minimum >= the argument"},
   {"clear",	(PyCFunction) BTree_clear,	METH_VARARGS,
    "clear() -- Remove all of the items from the BTree"},


=== Zope/lib/python/BTrees/convert.py 1.6 => 1.6.6.1 ===
--- Zope/lib/python/BTrees/convert.py:1.6	Wed Aug 14 17:32:23 2002
+++ Zope/lib/python/BTrees/convert.py	Tue Nov 12 16:13:57 2002
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-def convert(old, new, threshold=200, f=None, None=None):
+def convert(old, new, threshold=200, f=None):
     "Utility for converting old btree to new"
     n=0
     for k, v in old.items():