From 35a7f7bc32d422206e3e0475909fd5f463d6bee3 Mon Sep 17 00:00:00 2001
From: Tomasz Melcer <liori@exroot.org>
Date: Mon, 27 Nov 2006 20:28:24 +0000
Subject: [PATCH] Show general error desc if the stanza doesn't have error
code.
---
src/adhoc_commands.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index e627bd578e..f842c69f22 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -373,10 +373,13 @@ class CommandWindow:
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
+ try:
+ errorname = xmpp.NS_STANZAS + ' ' + str(errorid)
+ errordesc = xmpp.ERRORS[errorname][2]
+ error = errordesc.decode('utf-8')
+ del errorname, errordesc
+ except KeyError: # when stanza doesn't have error description
+ error = 'Service returned an error.'
elif error is not None:
# we've got error message
pass
--
GitLab