Replace method dynamically rather than doing a taken-once "if".

Also, factorise code to be executed when connection is established.

neo/lib/connection.py

@@ -689,9 +689,7 @@ class ClientConnection(Connection):
             except ConnectorInProgressException:
                 event_manager.addWriter(self)
             else:
-                self.connecting = False
-                self.updateTimeout(time())
-                self.getHandler().connectionCompleted(self)
+                self._connectionCompleted()
         except ConnectorConnectionRefusedException:
             self._closure()
         except ConnectorException:
@@ -701,18 +699,16 @@ class ClientConnection(Connection):
 
     def writable(self):
         """Called when self is writable."""
-        if self.connecting:
-            err = self.connector.getError()
-            if err:
+        if self.connector.getError():
             self._closure()
         else:
+            self._connectionCompleted()
+
+    def _connectionCompleted(self):
+        self.writable = super(ClientConnection, self).writable
         self.connecting = False
         self.updateTimeout(time())
         self.getHandler().connectionCompleted(self)
-                self.em.addReader(self)
-        else:
-            Connection.writable(self)
-
 
 class ServerConnection(Connection):
     """A connection from a remote node to this node."""