Author: asterix Date: 2007-06-03 15:57:42 +0200 (Sun, 03 Jun 2007) New Revision: 8205

Modified: trunk/src/adhoc_commands.py Log: [elghinn] code cleanup

Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2007-06-03 13:55:46 UTC (rev 8204) +++ trunk/src/adhoc_commands.py 2007-06-03 13:57:42 UTC (rev 8205) @@ -172,7 +172,7 @@ for (commandnode, commandname) in self.commandlist: radio = gtk.RadioButton(first_radio, label=commandname) radio.connect("toggled", self.on_command_radiobutton_toggled, commandnode) - if first_radio is None: + if not first_radio: first_radio = radio self.commandnode = commandnode self.command_list_vbox.pack_start(radio, expand=False) @@ -266,10 +266,10 @@

def stage3_submit_form(self, action='execute'): self.data_form_widget.set_sensitive(False) - if self.data_form_widget.get_data_form() is None: + if self.data_form_widget.get_data_form(): + self.data_form_widget.data_form.type='submit' + else: self.data_form_widget.hide() - else: - self.data_form_widget.data_form.type='submit'

self.close_button.set_sensitive(True) self.back_button.set_sensitive(False) @@ -286,13 +286,13 @@ self.remove_pulsing() self.sending_form_progressbar.hide()

- if self.sessionid is None: + if not self.sessionid: self.sessionid = command.getAttr('sessionid')

self.form_status = command.getAttr('status')

self.commandnode = command.getAttr('node') - if command.getTag('x') is not None: + if command.getTag('x'): self.dataform = dataforms.ExtendForm(node=command.getTag('x'))

self.data_form_widget.set_sensitive(True) @@ -310,17 +310,17 @@ self.data_form_widget.hide()

actions = command.getTag('actions') - if actions is None: - self.close_button.set_sensitive(True) - self.back_button.set_sensitive(False) - self.forward_button.set_sensitive(False) - self.execute_button.set_sensitive(True) - else: + if actions: # actions, actions, actions... self.close_button.set_sensitive(True) self.back_button.set_sensitive(actions.getTag('prev') is not None) self.forward_button.set_sensitive(actions.getTag('next') is not None) self.execute_button.set_sensitive(True) + else: + self.close_button.set_sensitive(True) + self.back_button.set_sensitive(False) + self.forward_button.set_sensitive(False) + self.execute_button.set_sensitive(True)

if self.form_status == 'completed': self.close_button.set_sensitive(True) @@ -331,7 +331,7 @@ self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked

note = command.getTag('note') - if note is not None: + if note: self.notes_label.set_text(note.getData().decode('utf-8')) self.notes_label.set_no_show_all(False) self.notes_label.show() @@ -371,9 +371,9 @@ # close old stage self.stage_finish()

- assert errorid is not None or error is not None + assert errorid or error

- if errorid is not None: + if errorid: # we've got error code, display appropriate message try: errorname = xmpp.NS_STANZAS + ' ' + str(errorid) @@ -382,7 +382,7 @@ del errorname, errordesc except KeyError: # when stanza doesn't have error description error = 'Service returned an error.' - elif error is not None: + elif error: # we've got error message pass else: @@ -411,7 +411,7 @@ def setup_pulsing(self, progressbar): '''Set the progressbar to pulse. Makes a custom function to repeatedly call progressbar.pulse() method.''' - assert self.pulse_id is None + assert not self.pulse_id assert isinstance(progressbar, gtk.ProgressBar)

def callback(): @@ -423,7 +423,7 @@

def remove_pulsing(self): '''Stop pulsing, useful when especially when removing widget.''' - if self.pulse_id is not None: + if self.pulse_id: gobject.source_remove(self.pulse_id) self.pulse_id=None

@@ -438,7 +438,7 @@ # FIXME: move to connection_handlers.py # is error => error stage error = response.getError() - if error is not None: + if error: # extracting error description from xmpp/protocol.py self.stage5(errorid = error) return @@ -472,10 +472,10 @@ 'action':action })

- if self.sessionid is not None: + if self.sessionid: cmdnode.setAttr('sessionid', self.sessionid)

- if self.data_form_widget.data_form is not None: + if self.data_form_widget.data_form: # cmdnode.addChild(node=dataforms.DataForm(tofill=self.data_form_widget.data_form)) # FIXME: simplified form to send @@ -484,7 +484,7 @@ def callback(response): # FIXME: move to connection_handlers.py err = response.getError() - if err is not None: + if err: self.stage5(errorid = err) else: self.stage3_next_form(response.getTag('command')) @@ -493,8 +493,8 @@

def send_cancel(self): '''Send the command with action='cancel'. ''' - assert self.commandnode is not None - if self.sessionid is not None and self.account.connection: + assert self.commandnode + if self.sessionid and self.account.connection: # we already have sessionid, so the service sent at least one reply. stanza = xmpp.Iq(typ='set', to=self.jid) stanza.addChild('command', attrs={