[Zodb-checkins] CVS: Zope/lib/python/BTrees - BTreeTemplate.c:1.25.12.1 BucketTemplate.c:1.28.12.1 Interfaces.py:1.9.20.1

[Casey Duncan]

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

Modified Files:
      Tag: casey-death_to_index_html-branch
	BTreeTemplate.c BucketTemplate.c Interfaces.py 
Log Message:
Updating branch to head for testing


=== Zope/lib/python/BTrees/BTreeTemplate.c 1.25 => 1.25.12.1 ===
   if (self->firstbucket)
     {
-      ASSERT(self->firstbucket->ob_refcnt > 1, 
+      ASSERT(self->firstbucket->ob_refcnt > 0, 
              "Invalid firstbucket pointer", -1);
       Py_DECREF(self->firstbucket);
       self->firstbucket=NULL;
@@ -573,7 +573,7 @@
   if (self->state==cPersistent_UPTODATE_STATE && self->jar)
     {
       if (_BTree_clear(self) < 0) return NULL;
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);


=== Zope/lib/python/BTrees/BucketTemplate.c 1.28 => 1.28.12.1 ===
     {
       if (_bucket_clear(self) < 0) return NULL;
-      self->state=cPersistent_GHOST_STATE;
+      PER_GHOSTIFY(self);
     }
 
   Py_INCREF(Py_None);


=== Zope/lib/python/BTrees/Interfaces.py 1.9 => 1.9.20.1 ===
         c2.
 
-        if c1 is not None and c2 not None, the output is weight1 and
-        c1.
+        if c1 is not None and c2 not None and both sets, the output is 
+        weight1 and c1.
 
-        If c1 and c2 are not None, the output is 1 and a Bucket
-        such that the output values are::
+        If c1 and c2 are not None and not both sets, the output is 1 
+        and a Bucket such that the output values are::
 
           v1*weight1 + v2*weight2
 
@@ -249,8 +249,8 @@
             v2 is 0 if the key was not in c2. Otherwise, v2 is 2, if
             c2 is a set, or the value from c2.
 
-        Note that c1 and c2 must be collections. None may not be
-        passed as one of the collections.
+        Note that c1 and c2 must be collections. 
+
         """
 
     def weightedIntersection(c1, c2, weight1=1, weight2=1):
@@ -264,7 +264,7 @@
         if c1 is not None and c2 not None, the output is weight1 and
         c1.
 
-        If c1 and c2 are sets, the output is the sum of the weights
+        If c1 and c2 are both sets, the output is the sum of the weights
         and the (unweighted) intersection of the sets.
 
         If c1 and c2 are not None and not both sets, the output is 1
@@ -280,8 +280,7 @@
             v2 is 0 if the key was not in c2. Otherwise, v2 is 2, if
             c2 is a set, or the value from c2.
 
-        Note that c1 and c2 must be collections. None may not be
-        passed as one of the collections.
+        Note that c1 and c2 must be collections. 
         """
 
 ###############################################################