diff options
| author | mathieui <mathieui@mathieui.net> | 2021-04-12 20:43:42 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2021-04-12 20:43:51 +0200 |
| commit | fc1eca7ac39bfc0dc82b2809b19b3d1c7b64a2c7 (patch) | |
| tree | 43c1e991617df5d981f2c9a704ae0732818c0a16 /poezio/tabs/bookmarkstab.py | |
| parent | e6510792b4d4dcb0d9e7746fff0dd891cba33e3a (diff) | |
| download | poezio-fc1eca7ac39bfc0dc82b2809b19b3d1c7b64a2c7.tar.gz poezio-fc1eca7ac39bfc0dc82b2809b19b3d1c7b64a2c7.tar.bz2 poezio-fc1eca7ac39bfc0dc82b2809b19b3d1c7b64a2c7.tar.xz poezio-fc1eca7ac39bfc0dc82b2809b19b3d1c7b64a2c7.zip | |
fix: remove all remaining safejids (fix #3457)
Diffstat (limited to 'poezio/tabs/bookmarkstab.py')
| -rw-r--r-- | poezio/tabs/bookmarkstab.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py index 4f4833fc..31902fa6 100644 --- a/poezio/tabs/bookmarkstab.py +++ b/poezio/tabs/bookmarkstab.py @@ -12,9 +12,8 @@ from poezio import windows from poezio.bookmarks import Bookmark, BookmarkList from poezio.core.structs import Command from poezio.tabs import Tab -from poezio.common import safeJID -from slixmpp import JID +from slixmpp import JID, InvalidJID log = logging.getLogger(__name__) @@ -82,10 +81,11 @@ class BookmarksTab(Tab): 'Duplicate bookmarks in list (saving aborted)', 'Error') return for bm in self.new_bookmarks: - if safeJID(bm.jid): + try: + JID(bm.jid) if not self.bookmarks[bm.jid]: self.bookmarks.append(bm) - else: + except InvalidJID: self.core.information( 'Invalid JID for bookmark: %s/%s' % (bm.jid, bm.nick), 'Error') |