[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - connection.py:1.49.4.1 client.py:1.25.16.1

[Jeremy Hylton]

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

Modified Files:
      Tag: Zope-2_7-branch
	connection.py client.py 
Log Message:
Take two: Merge changes from ZODB3-3_2-branch to Zope-2_7-branch.

Please make all future changes on the Zope-2_7-branch instead.

The previous attempt used "cvs up -j ZODB3-3_2-branch", but appeared
to get only a small fraction of the changes.  This attempt is based on
copying a checkout of ZODB3-3_2-branch over top of a checkout of
Zope-2_7-branch.


=== ZODB3/ZEO/zrpc/connection.py 1.49 => 1.49.4.1 ===
--- ZODB3/ZEO/zrpc/connection.py:1.49	Fri Jun 13 17:56:38 2003
+++ ZODB3/ZEO/zrpc/connection.py	Mon Sep 15 14:02:58 2003
@@ -67,7 +67,7 @@
         self.ready.wait()
         Delay.error(self, exc_info)
 
-class Connection(smac.SizedMessageAsyncConnection):
+class Connection(smac.SizedMessageAsyncConnection, object):
     """Dispatcher for RPC on object on both sides of socket.
 
     The connection supports synchronous calls, which expect a return,


=== ZODB3/ZEO/zrpc/client.py 1.25 => 1.25.16.1 ===
--- ZODB3/ZEO/zrpc/client.py:1.25	Mon Mar  3 13:02:39 2003
+++ ZODB3/ZEO/zrpc/client.py	Mon Sep 15 14:02:58 2003
@@ -28,7 +28,7 @@
 from ZEO.zrpc.trigger import trigger
 from ZEO.zrpc.connection import ManagedConnection
 
-class ConnectionManager:
+class ConnectionManager(object):
     """Keeps a connection up over time"""
 
     def __init__(self, addrs, client, tmin=1, tmax=180):