diff options
| author | Maxime Buquet <pep@bouah.net> | 2020-05-31 03:57:12 +0200 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2020-05-31 03:57:12 +0200 |
| commit | fe9992e3e8377896260ce1a92e4abb96cf1e8a01 (patch) | |
| tree | c5aadc2086bdd9cdac29b37955e6f85144d93a34 | |
| parent | ce9d59f19e2a4b2150de66bee1159931158e8009 (diff) | |
| parent | 6deb6ff39157006a3a9e86047a6f5c5e1421a4d4 (diff) | |
| download | poezio-fe9992e3e8377896260ce1a92e4abb96cf1e8a01.tar.gz poezio-fe9992e3e8377896260ce1a92e4abb96cf1e8a01.tar.bz2 poezio-fe9992e3e8377896260ce1a92e4abb96cf1e8a01.tar.xz poezio-fe9992e3e8377896260ce1a92e4abb96cf1e8a01.zip | |
Merge branch 'revert-types' into 'master'
Revert "Bookmarks: type bookmark method (local/remote)"
See merge request poezio/poezio!140
| -rw-r--r-- | poezio/bookmarks.py | 8 | ||||
| -rw-r--r-- | poezio/core/commands.py | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py index 46f6dfab..d842d2dd 100644 --- a/poezio/bookmarks.py +++ b/poezio/bookmarks.py @@ -30,7 +30,7 @@ Adding a remote bookmark: import functools import logging -from typing import Optional, List, Literal, Union +from typing import Optional, List, Union from slixmpp import InvalidJID, JID from slixmpp.plugins.xep_0048 import Bookmarks, Conference, URL @@ -39,8 +39,6 @@ from poezio.config import config log = logging.getLogger(__name__) -Method = Union[Literal['local'], Literal['remote']] - class Bookmark: def __init__(self, jid: Union[JID, str], @@ -48,7 +46,7 @@ class Bookmark: autojoin=False, nick: Optional[str] = None, password: Optional[str] = None, - method: Method = 'local') -> None: + method='local') -> None: try: if isinstance(jid, JID): self._jid = jid @@ -84,7 +82,7 @@ class Bookmark: return self._method @method.setter - def method(self, value: Method): + def method(self, value: str): if value not in ('local', 'remote'): log.debug('Could not set bookmark storing method: %s', value) return diff --git a/poezio/core/commands.py b/poezio/core/commands.py index 98acef32..6fc800ae 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -18,7 +18,7 @@ from poezio import common from poezio import pep from poezio import tabs from poezio import multiuserchat as muc -from poezio.bookmarks import Bookmark, Method as BookmarkMethod +from poezio.bookmarks import Bookmark from poezio.common import safeJID from poezio.config import config, DEFAULT_CONFIG, options as config_opts from poezio.contact import Contact, Resource @@ -444,7 +444,7 @@ class CommandCore: self._add_bookmark(jid, autojoin, password, 'remote') - def _add_bookmark(self, jid: str, autojoin: bool, password: str, method: BookmarkMethod) -> None: + def _add_bookmark(self, jid, autojoin, password, method): nick = None if not jid: tab = self.core.tabs.current_tab @@ -478,7 +478,7 @@ class CommandCore: self.core.bookmarks.save_remote(self.core.xmpp, self.core.handler.on_bookmark_result) - def _add_wildcard_bookmarks(self, method: BookmarkMethod): + def _add_wildcard_bookmarks(self, method): new_bookmarks = [] for tab in self.core.get_tabs(tabs.MucTab): bookmark = self.core.bookmarks[tab.jid.bare] |