From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 28 Aug 2007 16:57:57 -0000 Subject: [Cluster-devel] conga/luci/site/luci/Extensions/ClusterModel M ... Message-ID: <20070828165757.9004.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL4 Changes by: rmccabe at sourceware.org 2007-08-28 16:57:57 Modified files: luci/site/luci/Extensions/ClusterModel: ModelBuilder.py Log message: Cleanups from the -RHEL5 branch Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.3&r2=1.5.2.4 --- conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py 2007/08/24 21:55:43 1.5.2.3 +++ conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py 2007/08/28 16:57:56 1.5.2.4 @@ -929,11 +929,11 @@ self.isModified = True def set_nodes_multicast(self, mcast_addr, mcast_if=None): - for node in iter(self.getNodes()): + for node in self.getNodes(): new_mcast_tag = True mcast = None - for node_child in iter(node.getChildren()): + for node_child in node.getChildren(): if node_child.getTagName() == MCAST_STR: mcast = node_child new_mcast_tag = False @@ -980,8 +980,8 @@ self.isModified = True def del_nodes_multicast(self): - for node in iter(self.getNodes()): - for node_child in iter(node.getChildren()): + for node in self.getNodes(): + for node_child in node.getChildren(): if node_child.getTagName() == MCAST_STR: node.removeChild(node_child) break @@ -990,7 +990,7 @@ if self.CMAN_ptr is None: return False - for child in iter(self.CMAN_ptr.getChildren()): + for child in self.CMAN_ptr.getChildren(): if child.getTagName() == MCAST_STR: self.CMAN_ptr.removeChild(child)