[Zodb-checkins] CVS: ZODB3/ZEO - ClientStorage.py:1.53.2.1 ClientStub.py:1.5.2.1

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv31234

Modified Files:
      Tag: zeo_trace_branch
	ClientStorage.py ClientStub.py 
Log Message:
Merge trunk fixes (ZEO wire protocol fix) into branch.

=== ZODB3/ZEO/ClientStorage.py 1.53 => 1.53.2.1 ===
--- ZODB3/ZEO/ClientStorage.py:1.53	Wed Aug 28 14:59:06 2002
+++ ZODB3/ZEO/ClientStorage.py	Wed Aug 28 17:42:40 2002
@@ -508,3 +508,15 @@
                     "Invalidate(%s, %s) failed for _db: %s" % (repr(oid),
                                                                repr(version),
                                                                msg))
+
+    # Unfortunately, the ZEO 2 wire protocol uses different names for
+    # several of the callback methods invoked by the StorageServer.
+    # We can't change the wire protocol at this point because that
+    # would require synchronized updates of clients and servers and we
+    # don't want that.  So here we alias the old names to their new
+    # implementations.
+
+    begin = beginVerify
+    invalidate = invalidateVerify
+    end = endVerify
+    Invalidate = invalidateTrans


=== ZODB3/ZEO/ClientStub.py 1.5 => 1.5.2.1 ===
--- ZODB3/ZEO/ClientStub.py:1.5	Wed Aug 28 12:37:09 2002
+++ ZODB3/ZEO/ClientStub.py	Wed Aug 28 17:42:40 2002
@@ -18,16 +18,16 @@
         self.rpc = rpc
 
     def beginVerify(self):
-        self.rpc.callAsync('beginVerify')
+        self.rpc.callAsync('begin')
 
     def invalidateVerify(self, args):
-        self.rpc.callAsync('invalidateVerify', args)
+        self.rpc.callAsync('invalidate', args)
 
     def endVerify(self):
-        self.rpc.callAsync('endVerify')
+        self.rpc.callAsync('end')
 
     def invalidateTrans(self, args):
-        self.rpc.callAsync('invalidateTrans', args)
+        self.rpc.callAsync('Invalidate', args)
 
     def serialnos(self, arg):
         self.rpc.callAsync('serialnos', arg)