diff options
author | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-07 22:14:13 +0100 |
---|---|---|
committer | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-07 22:15:40 +0100 |
commit | d693479d05f1ada999c0e29a9d9e2f021dd59e50 (patch) | |
tree | e827a54d626999444549fb454898a892a2a58067 /poezio/tabs/basetabs.py | |
parent | cdd4a99c4522b596288ac006da451e5f89b3b50f (diff) | |
download | poezio-d693479d05f1ada999c0e29a9d9e2f021dd59e50.tar.gz poezio-d693479d05f1ada999c0e29a9d9e2f021dd59e50.tar.bz2 poezio-d693479d05f1ada999c0e29a9d9e2f021dd59e50.tar.xz poezio-d693479d05f1ada999c0e29a9d9e2f021dd59e50.zip |
safeJID: Remove some safeJID calls
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
Diffstat (limited to 'poezio/tabs/basetabs.py')
-rw-r--r-- | poezio/tabs/basetabs.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index 213f39d7..42a33330 100644 --- a/poezio/tabs/basetabs.py +++ b/poezio/tabs/basetabs.py @@ -20,7 +20,7 @@ from datetime import datetime from xml.etree import cElementTree as ET from typing import Any, Callable, Dict, List, Optional -from slixmpp import JID, Message +from slixmpp import JID, InvalidJID, Message from poezio.core.structs import Command, Completion, Status from poezio import timed_events @@ -462,8 +462,16 @@ class ChatTab(Tab): plugin_keys = {} # type: Dict[str, Callable] message_type = 'chat' - def __init__(self, core, jid=''): + def __init__(self, core, jid: JID = None): Tab.__init__(self, core) + if jid is not None and not isinstance(jid, JID): + # XXX: Remove logging once we're more or less sure we've switched + # all calls. + log.debug('ChatTab.name: %r: Not a JID object.', jid, exc_info=True) + try: + jid = JID(jid) + except InvalidJID: + log.debug('ChatTab.name: invalid JID.') self.name = jid self.text_win = None self.directed_presence = None |