From d62a2170e1aef7a768522222d2f5f4d2a26d5a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Thu, 10 Oct 2019 14:51:18 +0200 Subject: bookmarks: Convert specified jid to JID object if possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- poezio/bookmarks.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'poezio') diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py index ced6fde6..a812ef03 100644 --- a/poezio/bookmarks.py +++ b/poezio/bookmarks.py @@ -41,13 +41,20 @@ log = logging.getLogger(__name__) class Bookmark: def __init__(self, - jid: JID, + jid: Union[JID, str], name: Optional[str] = None, autojoin=False, nick: Optional[str] = None, password: Optional[str] = None, method='local') -> None: - self.jid = jid + try: + if isinstance(jid, JID): + self.jid = jid + else: + self.jid = JID(jid) + except InvalidJID: + log.debug('Invalid JID %r provided for bookmark %r', jid, name) + raise self.name = name or jid self.autojoin = autojoin self.nick = nick -- cgit v1.2.3