[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - connection.py:1.28

Guido van Rossum guido@python.org
Tue, 17 Sep 2002 17:07:01 -0400


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

Modified Files:
	connection.py 
Log Message:
Remove redundant class ServerConnection.

Cleanup comments for Managed*Connection.

Whitespace normalization.


=== ZODB3/ZEO/zrpc/connection.py 1.27 => 1.28 ===
--- ZODB3/ZEO/zrpc/connection.py:1.27	Tue Sep 17 12:33:33 2002
+++ ZODB3/ZEO/zrpc/connection.py	Tue Sep 17 17:07:00 2002
@@ -358,7 +358,7 @@
             log("wait() async=%d" % self.is_async(), level=zLOG.TRACE)
         if self.is_async():
             self.trigger.pull_trigger()
-            
+
         self.__replies_cond.acquire()
         try:
             while 1:
@@ -423,16 +423,9 @@
                     raise
                 else:
                     self.handle_error()
-                    
-
-class ServerConnection(Connection):
-    """Connection on the server side"""
-
-    # The server side does not send a protocol message.  Instead, it
-    # adapts to whatever the client sends it.
 
-class ManagedServerConnection(ServerConnection):
-    """A connection that notifies its ConnectionManager of closing"""
+class ManagedServerConnection(Connection):
+    """Server-side Connection subclass."""
     __super_init = Connection.__init__
     __super_close = Connection.close
 
@@ -447,11 +440,7 @@
         self.__mgr.close_conn(self)
 
 class ManagedConnection(Connection):
-    """A connection that notifies its ConnectionManager of closing.
-
-    A managed connection also defers the ThreadedAsync work to its
-    manager.
-    """
+    """Client-side Connection subclass."""
     __super_init = Connection.__init__
     __super_close = Connection.close
 
@@ -459,6 +448,8 @@
         self.__mgr = mgr
         self.__super_init(sock, addr, obj)
         self.check_mgr_async()
+
+    # Defer the ThreadedAsync work to the manager.
 
     def close_trigger(self):
         # the manager should actually close the trigger