[Zodb-checkins] CVS: Zope3/src/zodb/zeo - stubs.py:1.4.2.2 server.py:1.6.2.5 client.py:1.4.2.5

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-2-integration-branch
	stubs.py server.py client.py 
Log Message:
Fix arguments for invalidateTransaction() in stub.
Rename stub classes so that it is possible to distinguish between the
implementation class and the stub class in error messages.


=== Zope3/src/zodb/zeo/stubs.py 1.4.2.1 => 1.4.2.2 ===
--- Zope3/src/zodb/zeo/stubs.py:1.4.2.1	Mon Feb 10 17:08:31 2003
+++ Zope3/src/zodb/zeo/stubs.py	Thu Feb 13 12:57:04 2003
@@ -13,7 +13,7 @@
 ##############################################################################
 """RPC stubs for client and server interfaces."""
 
-class ClientStorage:
+class ClientStorageStub:
     """An RPC stub class for the interface exported by ClientStorage.
 
     This is the interface presented by ClientStorage to the
@@ -51,8 +51,8 @@
     def endVerify(self):
         self.rpc.callAsync('endVerify')
 
-    def invalidateTrans(self, args):
-        self.rpc.callAsync('invalidateTransaction', args)
+    def invalidateTransaction(self, tid, invlist):
+        self.rpc.callAsync('invalidateTransaction', tid, invlist)
 
     def serialnos(self, arg):
         self.rpc.callAsync('serialnos', arg)
@@ -60,7 +60,7 @@
     def info(self, arg):
         self.rpc.callAsync('info', arg)
 
-class StorageServer:
+class StorageServerStub:
     """An RPC stub class for the interface exported by ClientStorage.
 
     This is the interface presented by the StorageServer to the


=== Zope3/src/zodb/zeo/server.py 1.6.2.4 => 1.6.2.5 ===
--- Zope3/src/zodb/zeo/server.py:1.6.2.4	Thu Feb 13 12:45:52 2003
+++ Zope3/src/zodb/zeo/server.py	Thu Feb 13 12:57:04 2003
@@ -30,7 +30,7 @@
 import threading
 import time
 
-from zodb.zeo.stubs import ClientStorage
+from zodb.zeo.stubs import ClientStorageStub
 from zodb.zeo.commitlog import CommitLog
 from zodb.zeo.monitor import StorageStats, StatsServer
 from zodb.zeo.zrpc.server import Dispatcher
@@ -55,7 +55,7 @@
 
     # Classes we instantiate.  A subclass might override.
 
-    ClientStorageStubClass = ClientStorage
+    ClientStorageStubClass = ClientStorageStub
 
     def __init__(self, server, read_only=0):
         self.server = server


=== Zope3/src/zodb/zeo/client.py 1.4.2.4 => 1.4.2.5 ===
--- Zope3/src/zodb/zeo/client.py:1.4.2.4	Thu Feb 13 12:43:22 2003
+++ Zope3/src/zodb/zeo/client.py	Thu Feb 13 12:57:04 2003
@@ -31,7 +31,8 @@
 import types
 import logging
 
-from zodb.zeo import cache, stubs
+from zodb.zeo import cache
+from zodb.zeo.stubs import StorageServerStub
 from zodb.zeo.tbuf import TransactionBuffer
 from zodb.zeo.zrpc.client import ConnectionManager
 
@@ -89,7 +90,7 @@
     TransactionBufferClass = TransactionBuffer
     ClientCacheClass = cache.ClientCache
     ConnectionManagerClass = ConnectionManager
-    StorageServerStubClass = stubs.StorageServer
+    StorageServerStubClass = StorageServerStub
 
     # The exact storage interfaces depend on the server that the client
     # connects to.  We know that every storage must implement IStorage,