[Zodb-checkins] CVS: ZODB4/ZEO - ClientStorage.py:1.46

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/ZEO
In directory cvs.zope.org:/tmp/cvs-serv26087/ZEO

Modified Files:
	ClientStorage.py 
Log Message:
Remove unused variable r.

tpc_begin() doesn't return anything anyway.
Rename transaction to txn to make lines shorter.




=== ZODB4/ZEO/ClientStorage.py 1.45 => 1.46 ===
--- ZODB4/ZEO/ClientStorage.py:1.45	Tue Nov 26 12:41:20 2002
+++ ZODB4/ZEO/ClientStorage.py	Fri Dec 13 17:05:01 2002
@@ -602,7 +602,7 @@
         self._server.vote(self._serial)
         return self._check_serials()
 
-    def tpc_begin(self, transaction, tid=None, status=' '):
+    def tpc_begin(self, txn, tid=None, status=' '):
         """Storage API: begin a transaction."""
         if self._is_read_only:
             raise POSException.ReadOnlyError()
@@ -611,11 +611,11 @@
             # It is allowable for a client to call two tpc_begins in a
             # row with the same transaction, and the second of these
             # must be ignored.
-            if self._transaction == transaction:
+            if self._transaction == txn:
                 self._tpc_cond.release()
                 return
             self._tpc_cond.wait(30)
-        self._transaction = transaction
+        self._transaction = txn
         self._tpc_cond.release()
 
         if tid is None:
@@ -626,11 +626,8 @@
             id = tid
 
         try:
-            r = self._server.tpc_begin(id,
-                                       transaction.user,
-                                       transaction.description,
-                                       transaction._extension,
-                                       tid, status)
+            self._server.tpc_begin(id, txn.user, txn.description,
+                                   txn._extension, tid, status)
         except:
             # Client may have disconnected during the tpc_begin().
             if self._server is not disconnected_stub: