[Zodb-checkins] CVS: ZODB4/BDBStorage - BDBFullStorage.py:1.58

[Barry Warsaw]

Update of /cvs-repository/ZODB4/BDBStorage
In directory cvs.zope.org:/tmp/cvs-serv16677

Modified Files:
	BDBFullStorage.py 
Log Message:
intermediate

=== ZODB4/BDBStorage/BDBFullStorage.py 1.57 => 1.58 ===
--- ZODB4/BDBStorage/BDBFullStorage.py:1.57	Wed Dec  4 12:11:22 2002
+++ ZODB4/BDBStorage/BDBFullStorage.py	Wed Dec  4 14:41:49 2002
@@ -38,7 +38,8 @@
 # the Full and Minimal implementations.  It in turn inherits from
 # ZODB.BaseStorage.BaseStorage which itself provides some common storage
 # functionality.
-from BerkeleyBase import BerkeleyBase, PackStop, _WorkThread
+from BDBStorage.BerkeleyBase import BerkeleyBase, PackStop, _WorkThread
+from BDBStorage._helper import incr
 
 ABORT = 'A'
 COMMIT = 'C'
@@ -49,20 +50,6 @@
 DNE = '\377'*8
 # DEBUGGING
 #DNE = 'nonexist'
-
-try:
-    # Python 2.2
-    from _helper import incr
-except ImportError:
-    # Python 2.1
-    def incr(refcount, delta):
-        return p64(u64(refcount) + delta)
-
-try:
-    True, False
-except NameError:
-    True = 1
-    False = 0