Move ServerConnection instanciation to connection.py, as it is done inconditionally.

Make connection.py call connectionAccepted with the new connection as parameter.
Change connectionAccepted prototype, as fewer parameters are needed now that "conn" contains them.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1169 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/connection.py

@@ -150,7 +150,10 @@ class ListeningConnection(BaseConnection):
         try:
             new_s, addr = self.connector.getNewConnection()
             logging.debug('accepted a connection from %s:%d', *addr)
-            self.handler.connectionAccepted(self, new_s, addr)
+            handler = self.getHandler()
+            new_conn = ServerConnection(self.getEventManager(), handler,
+                                        connector=new_s, addr=addr)
+            handler.connectionAccepted(new_conn)
         except ConnectorTryAgainException:
             pass
 

neo/handler.py

@@ -134,13 +134,10 @@ class EventHandler(object):
         """Called when a connection failed."""
         logging.debug('connection failed for %s:%d', *(conn.getAddress()))
 
-    def connectionAccepted(self, conn, connector, addr):
+    def connectionAccepted(self, conn):
         """Called when a connection is accepted."""
-        logging.debug('connection accepted from %s:%d', *addr)
-        new_conn = ServerConnection(conn.getEventManager(), conn.getHandler(),
-                                    connector=connector, addr=addr)
         # A request for a node identification should arrive.
-        new_conn.expectMessage(timeout = 10, additional_timeout = 0)
+        conn.expectMessage(timeout = 10, additional_timeout = 0)
 
     def timeoutExpired(self, conn):
         """Called when a timeout event occurs."""