Removed some prints, iterTags->getTags.
This commit is contained in:
parent
54a4c26bea
commit
8744030d9c
|
@ -98,7 +98,6 @@ class AtomWindow:
|
||||||
|
|
||||||
def on_entry_title_button_press_event(self, widget, event):
|
def on_entry_title_button_press_event(self, widget, event):
|
||||||
# TODO: make it using special gtk2.10 widget
|
# TODO: make it using special gtk2.10 widget
|
||||||
print 1
|
|
||||||
if event.button == 1: # left click
|
if event.button == 1: # left click
|
||||||
uri = self.entry.uri
|
uri = self.entry.uri
|
||||||
if uri is not None:
|
if uri is not None:
|
||||||
|
@ -107,7 +106,6 @@ class AtomWindow:
|
||||||
|
|
||||||
def on_feed_title_button_press_event(self, widget, event):
|
def on_feed_title_button_press_event(self, widget, event):
|
||||||
# TODO: make it using special gtk2.10 widget
|
# TODO: make it using special gtk2.10 widget
|
||||||
print 2
|
|
||||||
if event.button == 1: # left click
|
if event.button == 1: # left click
|
||||||
uri = self.entry.feed_uri
|
uri = self.entry.feed_uri
|
||||||
if uri is not None:
|
if uri is not None:
|
||||||
|
|
|
@ -68,7 +68,6 @@ class ChangeStatusCommand(AdHocCommand):
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def isVisibleFor(samejid):
|
def isVisibleFor(samejid):
|
||||||
''' Change status is visible only if the entity has the same bare jid. '''
|
''' Change status is visible only if the entity has the same bare jid. '''
|
||||||
print 'isVisibleFor', samejid
|
|
||||||
return True # TODO: Remove that!
|
return True # TODO: Remove that!
|
||||||
return samejid
|
return samejid
|
||||||
|
|
||||||
|
@ -156,7 +155,6 @@ class ConnectionCommands:
|
||||||
return xmpp.JID(jid).getStripped() == self.getOurBareJID()
|
return xmpp.JID(jid).getStripped() == self.getOurBareJID()
|
||||||
|
|
||||||
def commandListQuery(self, con, iq_obj):
|
def commandListQuery(self, con, iq_obj):
|
||||||
print 'commandListQuery'
|
|
||||||
iq = iq_obj.buildReply('result')
|
iq = iq_obj.buildReply('result')
|
||||||
jid = helpers.get_full_jid_from_iq(iq_obj)
|
jid = helpers.get_full_jid_from_iq(iq_obj)
|
||||||
q = iq.getTag('query')
|
q = iq.getTag('query')
|
||||||
|
|
|
@ -201,7 +201,7 @@ class ListField(DataField):
|
||||||
'''Options.'''
|
'''Options.'''
|
||||||
def fget(self):
|
def fget(self):
|
||||||
options = []
|
options = []
|
||||||
for element in self.iterTags('option'):
|
for element in self.getTags('option'):
|
||||||
v = element.getTagData('value')
|
v = element.getTagData('value')
|
||||||
if v is None: raise WrongFieldValue
|
if v is None: raise WrongFieldValue
|
||||||
options.append((element.getAttr('label'), v))
|
options.append((element.getAttr('label'), v))
|
||||||
|
@ -211,7 +211,7 @@ class ListField(DataField):
|
||||||
for value, label in values:
|
for value, label in values:
|
||||||
self.addChild('option', {'label': label}).setTagData('value', value)
|
self.addChild('option', {'label': label}).setTagData('value', value)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for element in self.iterTags('option'):
|
for element in self.getTags('option'):
|
||||||
self.delChild(element)
|
self.delChild(element)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
@ -232,7 +232,7 @@ class ListMultiField(ListField):
|
||||||
'''Values held in field.'''
|
'''Values held in field.'''
|
||||||
def fget(self):
|
def fget(self):
|
||||||
values = []
|
values = []
|
||||||
for element in self.iterTags('value'):
|
for element in self.getTags('value'):
|
||||||
values.append(element.getData())
|
values.append(element.getData())
|
||||||
return values
|
return values
|
||||||
def fset(self, values):
|
def fset(self, values):
|
||||||
|
@ -240,12 +240,12 @@ class ListMultiField(ListField):
|
||||||
for value in values:
|
for value in values:
|
||||||
self.addChild('value').setData(value)
|
self.addChild('value').setData(value)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for element in self.iterTags('value'):
|
for element in self.getTags('value'):
|
||||||
self.delChild(element)
|
self.delChild(element)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
def iter_values():
|
def iter_values():
|
||||||
for element in self.iterTags('value'):
|
for element in self.getTags('value'):
|
||||||
yield element.getData()
|
yield element.getData()
|
||||||
|
|
||||||
class TextMultiField(DataField):
|
class TextMultiField(DataField):
|
||||||
|
@ -263,7 +263,7 @@ class TextMultiField(DataField):
|
||||||
for line in value.split('\n'):
|
for line in value.split('\n'):
|
||||||
self.addChild('value').setData(line)
|
self.addChild('value').setData(line)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for element in self.iterTags('value'):
|
for element in self.getTags('value'):
|
||||||
self.delChild(element)
|
self.delChild(element)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
@ -287,7 +287,7 @@ class DataRecord(ExtendedNode):
|
||||||
ExtendField(field)
|
ExtendField(field)
|
||||||
self.vars[field.var] = field
|
self.vars[field.var] = field
|
||||||
else:
|
else:
|
||||||
for field in self.iterTags('field'):
|
for field in self.getTags('field'):
|
||||||
self.delChild(field)
|
self.delChild(field)
|
||||||
self.fields = fields
|
self.fields = fields
|
||||||
|
|
||||||
|
@ -303,7 +303,7 @@ class DataRecord(ExtendedNode):
|
||||||
ExtendField(extend=field)
|
ExtendField(extend=field)
|
||||||
self.addChild(node=field)
|
self.addChild(node=field)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for element in self.iterTags('field'):
|
for element in self.getTags('field'):
|
||||||
self.delChild(element)
|
self.delChild(element)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
@ -364,7 +364,7 @@ class DataForm(ExtendedNode):
|
||||||
# TODO: the same code is in TextMultiField. join them
|
# TODO: the same code is in TextMultiField. join them
|
||||||
def fget(self):
|
def fget(self):
|
||||||
value = u''
|
value = u''
|
||||||
for value in self.iterTags('value'):
|
for value in self.getTags('value'):
|
||||||
value += '\n' + value.getData()
|
value += '\n' + value.getData()
|
||||||
return value[1:]
|
return value[1:]
|
||||||
def fset(self, value):
|
def fset(self, value):
|
||||||
|
@ -373,7 +373,7 @@ class DataForm(ExtendedNode):
|
||||||
for line in value.split('\n'):
|
for line in value.split('\n'):
|
||||||
self.addChild('value').setData(line)
|
self.addChild('value').setData(line)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for value in self.iterTags('value'):
|
for value in self.getTags('value'):
|
||||||
self.delChild(value)
|
self.delChild(value)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
|
@ -399,12 +399,12 @@ class MultipleDataForm(DataForm):
|
||||||
DataRecord(extend=record)
|
DataRecord(extend=record)
|
||||||
self.addChild(node=record)
|
self.addChild(node=record)
|
||||||
def fdel(self):
|
def fdel(self):
|
||||||
for record in self.iterTags('record'):
|
for record in self.getTags('record'):
|
||||||
self.delChild(record)
|
self.delChild(record)
|
||||||
return locals()
|
return locals()
|
||||||
|
|
||||||
def iter_records():
|
def iter_records():
|
||||||
for record in self.iterTags('item'):
|
for record in self.getTags('item'):
|
||||||
yield item
|
yield item
|
||||||
|
|
||||||
@nested_property
|
@nested_property
|
||||||
|
|
Loading…
Reference in New Issue