[Zope-CVS] CVS: ZODB4/ZEO - ClientStorage.py:1.43 StorageServer.py:1.41
Jeremy Hylton
jeremy@zope.com
Mon, 12 Aug 2002 18:59:35 -0400
Update of /cvs-repository/ZODB4/ZEO
In directory cvs.zope.org:/tmp/cvs-serv547/ZEO
Modified Files:
ClientStorage.py StorageServer.py
Log Message:
Update ZEO to work with ZODB4/Zope3.
XXX testLogRestart fails
=== ZODB4/ZEO/ClientStorage.py 1.42 => 1.43 ===
--- ZODB4/ZEO/ClientStorage.py:1.42 Thu Aug 1 15:15:42 2002
+++ ZODB4/ZEO/ClientStorage.py Mon Aug 12 18:59:05 2002
@@ -139,9 +139,9 @@
self._cache.close()
self._rpc_mgr.close()
- def registerDB(self, db, limit):
+ def registerDB(self, db):
"""Register that the storage is controlled by the given DB."""
- log2(INFO, "registerDB(%s, %s)" % (repr(db), repr(limit)))
+ log2(INFO, "registerDB(%s)" % (repr(db)))
self._db = db
def is_connected(self):
@@ -362,7 +362,7 @@
if tid is None:
self._ts = get_timestamp(self._ts)
- id = `self._ts`
+ id = self._ts.raw()
else:
self._ts = TimeStamp(tid)
id = tid
=== ZODB4/ZEO/StorageServer.py 1.40 => 1.41 ===
--- ZODB4/ZEO/StorageServer.py:1.40 Tue Aug 6 19:11:08 2002
+++ ZODB4/ZEO/StorageServer.py Mon Aug 12 18:59:05 2002
@@ -35,7 +35,7 @@
from ZODB.POSException import StorageError, StorageTransactionError, \
TransactionError, ReadOnlyError
from ZODB.referencesf import referencesf
-from ZODB.Transaction import Transaction
+from ZODB.ZTransaction import Transaction
from ZODB.TmpStore import TmpStore
# We create a special fast pickler! This allows us