copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Error handling when receiving commands.

This commit is contained in:
Tomasz Melcer 2006-08-01 15:45:42 +00:00
parent c1f211b2ca
commit 3b08d054be
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/adhoc_commands.py
View File

@ -313,7 +313,7 @@ class CommandWindow:
self.data_form_widget.data_form=self.dataform self.data_form_widget.data_form=self.dataform
except dataforms.BadDataFormNode: except dataforms.BadDataFormNode:
# TODO: translate # TODO: translate
self.stage5('Service sent malformed data', senderror=True) self.stage5(error='Service sent malformed data', senderror=True)
self.data_form_widget.show() self.data_form_widget.show()
else: else:
self.data_form_widget.hide() self.data_form_widget.hide()
@ -376,13 +376,26 @@ class CommandWindow:
self.stage1() self.stage1()
# stage 5: an error has occured # stage 5: an error has occured
def stage5(self, error, senderror=False): def stage5(self, error=None, errorid=None, senderror=False):
'''Display the error message. Wait for user to close the window''' '''Display the error message. Wait for user to close the window'''
# TODO: sending error to responder # TODO: sending error to responder
# close old stage # close old stage
self.stage_finish() self.stage_finish()
assert isinstance(error, basestring) assert errorid is not None or error is not None
if errorid is not None:
# we've got error code, display appropriate message
errorname = xmpp.NS_STANZAS + ' ' + str(errorid)
errordesc = xmpp.ERRORS[errorname][2]
error = errordesc.decode('utf-8')
del errorname, errordesc
elif error is not None:
# we've got error message
pass
else:
# we don't know what's that, bailing out
assert False
self.stages_notebook.set_current_page( self.stages_notebook.set_current_page(
self.stages_notebook.page_num( self.stages_notebook.page_num(
@ -435,9 +448,7 @@ class CommandWindow:
error = response.getError() error = response.getError()
if error is not None: if error is not None:
# extracting error description from xmpp/protocol.py # extracting error description from xmpp/protocol.py
errorname=xmpp.NS_STANZAS + ' ' + str(error) self.stage5(errorid = error)
errordesc=xmpp.ERRORS[errorname][2]
self.stage5(errordesc.decode('utf-8'))
return return
# no commands => no commands stage # no commands => no commands stage
@ -472,8 +483,11 @@ class CommandWindow:
cmdnode.addChild(node=dataforms.DataForm(tofill=self.data_form_widget.data_form)) cmdnode.addChild(node=dataforms.DataForm(tofill=self.data_form_widget.data_form))
def callback(response): def callback(response):
# TODO: error handling
# TODO: move to connection_handlers.py # TODO: move to connection_handlers.py
err = response.getError()
if err is not None:
self.stage5(errorid = err)
else:
self.stage3_next_form(response.getTag('command')) self.stage3_next_form(response.getTag('command'))
print stanza print stanza