[Zope3-checkins] CVS: Zope3/src/zodb/btrees - IIBTree.py:1.3.38.1 IOBTree.py:1.3.38.1 Length.py:1.2.74.1 OIBTree.py:1.3.38.1 OOBTree.py:1.3.38.1 fsBTree.py:1.3.38.1 BTreeItemsTemplate.c:NONE BTreeModuleTemplate.c:NONE BTreeTemplate.c:NONE BucketTemplate.c:NONE Maintainer.txt:NONE MergeTemplate.c:NONE SetOpTemplate.c:NONE SetTemplate.c:NONE TreeSetTemplate.c:NONE _zodb_btrees_IIBTree.c:NONE _zodb_btrees_IOBTree.c:NONE _zodb_btrees_OIBTree.c:NONE _zodb_btrees_OOBTree.c:NONE _zodb_btrees_fsBTree.c:NONE intkeymacros.h:NONE intvaluemacros.h:NONE objectkeymacros.h:NONE objectvaluemacros.h:NONE sorters.c:NONE

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zodb/btrees
In directory cvs.zope.org:/tmp/cvs-serv25080/src/zodb/btrees

Modified Files:
      Tag: zope3-zodb3-devel-branch
	IIBTree.py IOBTree.py Length.py OIBTree.py OOBTree.py 
	fsBTree.py 
Removed Files:
      Tag: zope3-zodb3-devel-branch
	BTreeItemsTemplate.c BTreeModuleTemplate.c BTreeTemplate.c 
	BucketTemplate.c Maintainer.txt MergeTemplate.c 
	SetOpTemplate.c SetTemplate.c TreeSetTemplate.c 
	_zodb_btrees_IIBTree.c _zodb_btrees_IOBTree.c 
	_zodb_btrees_OIBTree.c _zodb_btrees_OOBTree.c 
	_zodb_btrees_fsBTree.c intkeymacros.h intvaluemacros.h 
	objectkeymacros.h objectvaluemacros.h sorters.c 
Log Message:
Checkpointing to the branch after beginning the process of removing
zodb 4 code. 

Lots of things are now broken. :)




=== Zope3/src/zodb/btrees/IIBTree.py 1.3 => 1.3.38.1 ===
--- Zope3/src/zodb/btrees/IIBTree.py:1.3	Thu May  8 16:39:45 2003
+++ Zope3/src/zodb/btrees/IIBTree.py	Fri Jan  9 17:23:28 2004
@@ -11,4 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zodb.btrees._zodb_btrees_IIBTree import *
+from BTrees.IIBTree import *


=== Zope3/src/zodb/btrees/IOBTree.py 1.3 => 1.3.38.1 ===
--- Zope3/src/zodb/btrees/IOBTree.py:1.3	Thu May  8 16:39:45 2003
+++ Zope3/src/zodb/btrees/IOBTree.py	Fri Jan  9 17:23:29 2004
@@ -11,4 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zodb.btrees._zodb_btrees_IOBTree import *
+from BTrees._IOBTree import *


=== Zope3/src/zodb/btrees/Length.py 1.2 => 1.2.74.1 ===
--- Zope3/src/zodb/btrees/Length.py:1.2	Wed Dec 25 09:12:16 2002
+++ Zope3/src/zodb/btrees/Length.py	Fri Jan  9 17:23:29 2004
@@ -11,32 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import persistence
-
-class Length(persistence.Persistent):
-    """BTree lengths are too expensive to compute
-
-    Objects that use BTrees need to keep track of lengths themselves.
-    This class provides an object for doing this.
-
-    As a bonus, the object support application-level conflict resolution.
-    """
-
-    def __init__(self, v=0): self.value=v
-
-    def __getstate__(self): return self.value
-
-    def __setstate__(self, v): self.value=v
-
-    def set(self, v): self.value=v
-
-    def _p_resolveConflict(self, old, s1, s2): return s1 + s2 - old
-
-    def _p_independent(self):
-        # My state doesn't depend on or materially effect the state of
-        # other objects.
-        return 1
-
-    def change(self, delta): self.value = self.value + delta
-
-    def __call__(self, *args): return self.value
+from BTrees.Length import Length


=== Zope3/src/zodb/btrees/OIBTree.py 1.3 => 1.3.38.1 ===
--- Zope3/src/zodb/btrees/OIBTree.py:1.3	Thu May  8 16:39:45 2003
+++ Zope3/src/zodb/btrees/OIBTree.py	Fri Jan  9 17:23:29 2004
@@ -11,4 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zodb.btrees._zodb_btrees_OIBTree import *
+from BTrees._OIBTree import *


=== Zope3/src/zodb/btrees/OOBTree.py 1.3 => 1.3.38.1 ===
--- Zope3/src/zodb/btrees/OOBTree.py:1.3	Thu May  8 16:39:45 2003
+++ Zope3/src/zodb/btrees/OOBTree.py	Fri Jan  9 17:23:29 2004
@@ -11,4 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zodb.btrees._zodb_btrees_OOBTree import *
+from BTrees._OOBTree import *


=== Zope3/src/zodb/btrees/fsBTree.py 1.3 => 1.3.38.1 ===
--- Zope3/src/zodb/btrees/fsBTree.py:1.3	Thu May  8 16:39:45 2003
+++ Zope3/src/zodb/btrees/fsBTree.py	Fri Jan  9 17:23:29 2004
@@ -11,4 +11,4 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zodb.btrees._zodb_btrees_fsBTree import *
+from BTrees._fsBTree import *

=== Removed File Zope3/src/zodb/btrees/BTreeItemsTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/BTreeModuleTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/BTreeTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/BucketTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/Maintainer.txt ===

=== Removed File Zope3/src/zodb/btrees/MergeTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/SetOpTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/SetTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/TreeSetTemplate.c ===

=== Removed File Zope3/src/zodb/btrees/_zodb_btrees_IIBTree.c ===

=== Removed File Zope3/src/zodb/btrees/_zodb_btrees_IOBTree.c ===

=== Removed File Zope3/src/zodb/btrees/_zodb_btrees_OIBTree.c ===

=== Removed File Zope3/src/zodb/btrees/_zodb_btrees_OOBTree.c ===

=== Removed File Zope3/src/zodb/btrees/_zodb_btrees_fsBTree.c ===

=== Removed File Zope3/src/zodb/btrees/intkeymacros.h ===

=== Removed File Zope3/src/zodb/btrees/intvaluemacros.h ===

=== Removed File Zope3/src/zodb/btrees/objectkeymacros.h ===

=== Removed File Zope3/src/zodb/btrees/objectvaluemacros.h ===

=== Removed File Zope3/src/zodb/btrees/sorters.c ===