erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

complete the Exception's list when catching JID error:

Browse source 
- Twisted JID constructor raises not only jid.InvalidFormat but also RuntimeError and AttributeError
This commit is contained in:
souliane 2015-12-15 13:30:47 +01:00
commit a6a967b2f0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/plugin_xep_0045.py
View file

@ -562,7 +562,7 @@ class XEP_0045(object):
entity_jid = jid.JID(jid_s).userhostJID()
assert(entity_jid.user)
assert(entity_jid.host)
except (IndexError, jid.InvalidFormat, AssertionError):
except (RuntimeError, jid.InvalidFormat, AttributeError, IndexError, AssertionError):
feedback = _(u"You must provide a valid JID to ban, like in '/ban contact@example.net'")
self.host.plugins[C.TEXT_CMDS].feedBack(feedback, mess_data, profile)
return False
@ -594,7 +594,7 @@ class XEP_0045(object):
entity_jid = jid.JID(jid_s).userhostJID()
assert(entity_jid.user)
assert(entity_jid.host)
except (IndexError, jid.InvalidFormat, AssertionError):
except (RuntimeError, jid.InvalidFormat, AttributeError, IndexError, AssertionError):
feedback = _(u"You must provide a valid JID to affiliate, like in '/affiliate contact@example.net member'")
self.host.plugins[C.TEXT_CMDS].feedBack(feedback, mess_data, profile)
return False