Fix address format in neoctl and admin node.

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

neo/admin/handler.py

@@ -64,7 +64,7 @@ class AdminEventHandler(EventHandler):
             except TypeError:
                 ip = "0.0.0.0"
                 port = 0
-            node_information_list.append((node.getNodeType(), ip, port, node.getUUID(), node.getState()))
+            node_information_list.append((node.getNodeType(), (ip, port), node.getUUID(), node.getState()))
         p = protocol.answerNodeList(node_information_list)
         conn.answer(p, packet)
 

neo/neoctl/handler.py

@@ -65,8 +65,8 @@ class CommandEventHandler(EventHandler):
         if len(node_list) == 0:
             data = "No Node"
         else:
-            for node_type, ip, port, uuid, state in node_list:
-                data += "\n%s - %s - %s:%s - %s" %(node_type, dump(uuid), ip, port, state)
+            for node_type, (ip, port), uuid, state in node_list:
+                data += "\n%s - %s - %s:%s - %s" % (node_type, dump(uuid), ip, port, state)
         self.app.result = data
 
     def handleAnswerNodeState(self, conn, packet, uuid, state):