[Zope3-checkins] CVS: ZODB4/src/zodb/storage - base.py:1.30
Jeremy Hylton
jeremy@zope.com
Thu, 19 Jun 2003 17:41:41 -0400
Update of /cvs-repository/ZODB4/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv15960/src/zodb/storage
Modified Files:
base.py
Log Message:
Merge ZODB3-2-merge branch to the head.
This completes the porting of bug fixes and random improvements from
ZODB 3.2 to ZODB 4.
=== ZODB4/src/zodb/storage/base.py 1.29 => 1.30 ===
--- ZODB4/src/zodb/storage/base.py:1.29 Thu May 15 16:59:03 2003
+++ ZODB4/src/zodb/storage/base.py Thu Jun 19 17:41:10 2003
@@ -36,7 +36,7 @@
berkeley_is_available = True
except ImportError:
berkeley_is_available = False
- # But, DemoStorage piggybacks on the implementation of BDBFullStorage so
+ # But, MemoryStorage piggybacks on the implementation of BDBFullStorage so
# create a fake db object that has some useful constants.
class db:
DB_QUEUE = 1
@@ -46,7 +46,6 @@
class DBNotFoundError(Exception): pass
class DBKeyEmpty(Exception): pass
-
from zodb.conflict import ConflictResolver
from zodb.timestamp import newTimeStamp, TimeStamp
from zodb.interfaces import ITransactionAttrs, ZERO
@@ -302,7 +301,7 @@
filter = None
return self.undoLog(first, last, filter)
- def undoLog(self, first, last, filter=None):
+ def undoLog(self, first=0, last=-20, filter=None):
return ()
def versionEmpty(self, version):