[Zope3-checkins] CVS: Zope3/src/zodb/zeo - server.py:1.6.2.3 client.py:1.4.2.4

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-2-integration-branch
	server.py client.py 
Log Message:
Fix a few tpc_xxx occurrences that were missed earlier.


=== Zope3/src/zodb/zeo/server.py 1.6.2.2 => 1.6.2.3 ===
--- Zope3/src/zodb/zeo/server.py:1.6.2.2	Mon Feb 10 17:08:31 2003
+++ Zope3/src/zodb/zeo/server.py	Thu Feb 13 12:43:22 2003
@@ -296,7 +296,7 @@
             raise ReadOnlyError()
         if self.transaction is not None:
             if self.transaction.id == id:
-                self.logger.warn("duplicate tpc_begin(%r)", id)
+                self.logger.warn("duplicate tpcBegin(%r)", id)
                 return
             else:
                 raise StorageTransactionError("Multiple simultaneous tpc_begin"
@@ -340,7 +340,7 @@
         self._clear_transaction()
 
     def _clear_transaction(self):
-        # Common code at end of tpc_finish() and tpc_abort()
+        # Common code at end of tpcFinish() and tpcAbort()
         self.transaction = None
         if self.locked:
             self.locked = 0


=== Zope3/src/zodb/zeo/client.py 1.4.2.3 => 1.4.2.4 ===
--- Zope3/src/zodb/zeo/client.py:1.4.2.3	Thu Feb 13 12:39:39 2003
+++ Zope3/src/zodb/zeo/client.py	Thu Feb 13 12:43:22 2003
@@ -745,9 +745,9 @@
             # all, yet you want to be sure that other abort logic is
             # executed regardless.
             try:
-                self._server.tpc_abort(self._serial)
+                self._server.tpcAbort(self._serial)
             except ClientDisconnected:
-                self.logger.info("ClientDisconnected in tpc_abort() ignored")
+                self.logger.info("ClientDisconnected in tpcAbort() ignored")
         finally:
             self._tbuf.clear()
             self._seriald.clear()