From 8744030d9cea3a17b343c8b5528120f6c1b5a23e Mon Sep 17 00:00:00 2001
From: Tomasz Melcer <liori@exroot.org>
Date: Sat, 18 Nov 2006 21:25:55 +0000
Subject: [PATCH] Removed some prints, iterTags->getTags.

---
 src/atom_window.py      |  2 --
 src/common/commands.py  |  2 --
 src/common/dataforms.py | 24 ++++++++++++------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/atom_window.py b/src/atom_window.py
index 54bf32806..622aea2db 100644
--- a/src/atom_window.py
+++ b/src/atom_window.py
@@ -98,7 +98,6 @@ class AtomWindow:
 
 	def on_entry_title_button_press_event(self, widget, event):
 		# TODO: make it using special gtk2.10 widget
-		print 1
 		if event.button == 1:	# left click
 			uri = self.entry.uri
 			if uri is not None:
@@ -107,7 +106,6 @@ class AtomWindow:
 
 	def on_feed_title_button_press_event(self, widget, event):
 		# TODO: make it using special gtk2.10 widget
-		print 2
 		if event.button == 1:	# left click
 			uri = self.entry.feed_uri
 			if uri is not None:
diff --git a/src/common/commands.py b/src/common/commands.py
index da0aea905..9264f7e11 100644
--- a/src/common/commands.py
+++ b/src/common/commands.py
@@ -68,7 +68,6 @@ class ChangeStatusCommand(AdHocCommand):
 	@staticmethod
 	def isVisibleFor(samejid):
 		''' Change status is visible only if the entity has the same bare jid. '''
-		print 'isVisibleFor', samejid
 		return True	# TODO: Remove that!
 		return samejid
 
@@ -156,7 +155,6 @@ class ConnectionCommands:
 		return xmpp.JID(jid).getStripped() == self.getOurBareJID()
 
 	def commandListQuery(self, con, iq_obj):
-		print 'commandListQuery'
 		iq = iq_obj.buildReply('result')
 		jid = helpers.get_full_jid_from_iq(iq_obj)
 		q = iq.getTag('query')
diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index 92f20deb6..8440d4ed8 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -201,7 +201,7 @@ class ListField(DataField):
 		'''Options.'''
 		def fget(self):
 			options = []
-			for element in self.iterTags('option'):
+			for element in self.getTags('option'):
 				v = element.getTagData('value')
 				if v is None: raise WrongFieldValue
 				options.append((element.getAttr('label'), v))
@@ -211,7 +211,7 @@ class ListField(DataField):
 			for value, label in values:
 				self.addChild('option', {'label': label}).setTagData('value', value)
 		def fdel(self):
-			for element in self.iterTags('option'):
+			for element in self.getTags('option'):
 				self.delChild(element)
 		return locals()
 
@@ -232,7 +232,7 @@ class ListMultiField(ListField):
 		'''Values held in field.'''
 		def fget(self):
 			values = []
-			for element in self.iterTags('value'):
+			for element in self.getTags('value'):
 				values.append(element.getData())
 			return values
 		def fset(self, values):
@@ -240,12 +240,12 @@ class ListMultiField(ListField):
 			for value in values:
 				self.addChild('value').setData(value)
 		def fdel(self):
-			for element in self.iterTags('value'):
+			for element in self.getTags('value'):
 				self.delChild(element)
 		return locals()
 	
 	def iter_values():
-		for element in self.iterTags('value'):
+		for element in self.getTags('value'):
 			yield element.getData()
 
 class TextMultiField(DataField):
@@ -263,7 +263,7 @@ class TextMultiField(DataField):
 			for line in value.split('\n'):
 				self.addChild('value').setData(line)
 		def fdel(self):
-			for element in self.iterTags('value'):
+			for element in self.getTags('value'):
 				self.delChild(element)
 		return locals()
 
@@ -287,7 +287,7 @@ class DataRecord(ExtendedNode):
 						ExtendField(field)
 					self.vars[field.var] = field
 			else:
-				for field in self.iterTags('field'):
+				for field in self.getTags('field'):
 					self.delChild(field)
 				self.fields = fields
 
@@ -303,7 +303,7 @@ class DataRecord(ExtendedNode):
 					ExtendField(extend=field)
 				self.addChild(node=field)
 		def fdel(self):
-			for element in self.iterTags('field'):
+			for element in self.getTags('field'):
 				self.delChild(element)
 		return locals()
 
@@ -364,7 +364,7 @@ class DataForm(ExtendedNode):
 		# TODO: the same code is in TextMultiField. join them
 		def fget(self):
 			value = u''
-			for value in self.iterTags('value'):
+			for value in self.getTags('value'):
 				value += '\n' + value.getData()
 			return value[1:]
 		def fset(self, value):
@@ -373,7 +373,7 @@ class DataForm(ExtendedNode):
 			for line in value.split('\n'):
 				self.addChild('value').setData(line)
 		def fdel(self):
-			for value in self.iterTags('value'):
+			for value in self.getTags('value'):
 				self.delChild(value)
 		return locals()
 
@@ -399,12 +399,12 @@ class MultipleDataForm(DataForm):
 					DataRecord(extend=record)
 				self.addChild(node=record)
 		def fdel(self):
-			for record in self.iterTags('record'):
+			for record in self.getTags('record'):
 				self.delChild(record)
 		return locals()
 
 	def iter_records():
-		for record in self.iterTags('item'):
+		for record in self.getTags('item'):
 			yield item
 
 	@nested_property