Mercurial > libervia-backend
changeset 1742:244a605623d6
complete the Exception's list when catching JID error:
- Twisted JID constructor raises not only jid.InvalidFormat but also RuntimeError and AttributeError
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Tue, 15 Dec 2015 13:30:47 +0100 |
| parents | cc31dd72526d |
| children | 4c48468ead4c |
| files | src/plugins/plugin_exp_command_export.py src/plugins/plugin_exp_parrot.py src/plugins/plugin_misc_text_commands.py src/plugins/plugin_xep_0045.py src/plugins/plugin_xep_0065.py |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/plugin_exp_command_export.py Fri Dec 11 09:12:11 2015 +0100 +++ b/src/plugins/plugin_exp_command_export.py Tue Dec 15 13:30:47 2015 +0100 @@ -151,7 +151,7 @@ if not _jid.user or not _jid.host: raise jid.InvalidFormat _jid = _jid.userhostJID() - except (jid.InvalidFormat, RuntimeError): + except (RuntimeError, jid.InvalidFormat, AttributeError): log.info(u"invalid target ignored: %s" % (target,)) continue process_prot = ExportCommandProtocol(self, _jid, options, profile)
--- a/src/plugins/plugin_exp_parrot.py Fri Dec 11 09:12:11 2015 +0100 +++ b/src/plugins/plugin_exp_parrot.py Tue Dec 15 13:30:47 2015 +0100 @@ -139,7 +139,7 @@ link_left_jid = jid.JID(mess_data["unparsed"].strip()) if not link_left_jid.user or not link_left_jid.host: raise jid.InvalidFormat - except jid.InvalidFormat: + except (RuntimeError, jid.InvalidFormat, AttributeError): txt_cmd.feedBack("Can't activate Parrot mode for invalid jid", mess_data, profile) return False
--- a/src/plugins/plugin_misc_text_commands.py Fri Dec 11 09:12:11 2015 +0100 +++ b/src/plugins/plugin_misc_text_commands.py Tue Dec 15 13:30:47 2015 +0100 @@ -296,7 +296,7 @@ target_jid = jid.JID(entity) if not target_jid.user or not target_jid.host: raise jid.InvalidFormat - except (jid.InvalidFormat, RuntimeError): + except (RuntimeError, jid.InvalidFormat, AttributeError): self.feedBack(_("Invalid jid, can't whois"), mess_data, profile) return False
--- a/src/plugins/plugin_xep_0045.py Fri Dec 11 09:12:11 2015 +0100 +++ b/src/plugins/plugin_xep_0045.py Tue Dec 15 13:30:47 2015 +0100 @@ -562,7 +562,7 @@ 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 @@ 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
--- a/src/plugins/plugin_xep_0065.py Fri Dec 11 09:12:11 2015 +0100 +++ b/src/plugins/plugin_xep_0065.py Tue Dec 15 13:30:47 2015 +0100 @@ -782,7 +782,7 @@ if not all((host, jid, port)): raise KeyError jid_ = jid.JID(jid_) - except (StopIteration, KeyError, RuntimeError, jid.InvalidFormat): + except (StopIteration, KeyError, RuntimeError, jid.InvalidFormat, AttributeError): log.warning(u"Invalid proxy data received from {}".format(proxy.full())) notFound(server)