From d8638d5e31dc2c25b9ca39283abecb526ef3f07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Mon, 2 Sep 2019 13:27:31 +0200 Subject: Eradicate more safeJID calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- poezio/bookmarks.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'poezio/bookmarks.py') diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py index 0406de94..ced6fde6 100644 --- a/poezio/bookmarks.py +++ b/poezio/bookmarks.py @@ -32,9 +32,8 @@ import functools import logging from typing import Optional, List, Union -from slixmpp import JID +from slixmpp import InvalidJID, JID from slixmpp.plugins.xep_0048 import Bookmarks, Conference, URL -from poezio.common import safeJID from poezio.config import config log = logging.getLogger(__name__) @@ -288,7 +287,10 @@ class BookmarkList: return rooms = rooms.split(':') for room in rooms: - jid = safeJID(room) + try: + jid = JID(room) + except InvalidJID: + continue if jid.bare == '': continue if jid.resource != '': -- cgit v1.2.3