from __future__ import annotations

Now that our baseline is Python 3.7, we can rely on type annotations to
be lazily evaluated.

11 files changed, 53 insertions, 49 deletions

diff --git a/poezio/tabs/adhoc_commands_list.py b/poezio/tabs/adhoc_commands_list.py
index b62166b0..3b6bc1db 100644
--- a/poezio/tabs/adhoc_commands_list.py
+++ b/poezio/tabs/adhoc_commands_list.py
@@ -16,8 +16,8 @@ log = logging.getLogger(__name__)
 
 
 class AdhocCommandsListTab(ListTab):
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, jid):
         ListTab.__init__(
diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index e4cdc3af..3907d7bc 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -13,6 +13,8 @@ This module also defines ChatTabs, the parent class for all tabs
 revolving around chats.
 """
 
+from __future__ import annotations
+
 import copy
 import logging
 import string
@@ -111,13 +113,13 @@ SHOW_NAME = {
 
 
 class Tab:
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
     # Placeholder values, set on resize
     height = 1
     width = 1
 
-    def __init__(self, core: 'Core'):
+    def __init__(self, core: Core):
         self.core = core
         self.nb = 0
         if not hasattr(self, 'name'):
@@ -133,7 +135,7 @@ class Tab:
         self.commands = {}  # and their own commands
 
     @property
-    def size(self) -> 'SizeManager':
+    def size(self) -> SizeManager:
         return self.core.size
 
     @staticmethod
@@ -196,7 +198,7 @@ class Tab:
             self._state = 'normal'
 
     @staticmethod
-    def initial_resize(scr: '_CursesWindow'):
+    def initial_resize(scr: _CursesWindow):
         Tab.height, Tab.width = scr.getmaxyx()
         windows.base_wins.TAB_WIN = scr
 
@@ -479,8 +481,8 @@ class ChatTab(Tab):
     Also, ^M is already bound to on_enter
     And also, add the /say command
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
     message_type = 'chat'
 
     def __init__(self, core, jid: Union[JID, str]):
@@ -492,7 +494,7 @@ class ChatTab(Tab):
         self._jid = jid
         #: Is the tab currently requesting MAM data?
         self.query_status = False
-        self._name = jid.full  # type: Optional[str]
+        self._name: Optional[str] = jid.full
         self.text_win = windows.TextWin()
         self.directed_presence = None
         self._text_buffer = TextBuffer()
@@ -532,7 +534,7 @@ class ChatTab(Tab):
             desc='Fix the last message with whatever you want.',
             shortdesc='Correct the last message.',
             completion=self.completion_correct)
-        self.chat_state = None  # type: Optional[str]
+        self.chat_state: Optional[str] = None
         self.update_commands()
         self.update_keys()
 
diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py
index eb390bd3..c4fdadd3 100644
--- a/poezio/tabs/bookmarkstab.py
+++ b/poezio/tabs/bookmarkstab.py
@@ -21,15 +21,15 @@ class BookmarksTab(Tab):
     A tab displaying lines of bookmarks, each bookmark having
     a 4 widgets to set the jid/password/autojoin/storage method
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, bookmarks: BookmarkList):
         Tab.__init__(self, core)
         self.name = "Bookmarks"
         self.bookmarks = bookmarks
-        self.new_bookmarks = []  # type: List[Bookmark]
-        self.removed_bookmarks = []  # type: List[Bookmark]
+        self.new_bookmarks: List[Bookmark] = []
+        self.removed_bookmarks: List[Bookmark] = []
         self.header_win = windows.ColumnHeaderWin(
             ('name', 'room@server/nickname', 'password', 'autojoin',
              'storage'))
diff --git a/poezio/tabs/confirmtab.py b/poezio/tabs/confirmtab.py
index c13de4a6..89d0daf5 100644
--- a/poezio/tabs/confirmtab.py
+++ b/poezio/tabs/confirmtab.py
@@ -13,8 +13,8 @@ log = logging.getLogger(__name__)
 
 
 class ConfirmTab(Tab):
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self,
                  core,
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index 5950e4cb..5d62fa5f 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -38,9 +38,9 @@ class ConversationTab(OneToOneTab):
     The tab containing a normal conversation (not from a MUC)
     Must not be instantiated, use Static or Dynamic version only.
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
-    additional_information = {}  # type: Dict[str, Callable[[str], str]]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
+    additional_information: Dict[str, Callable[[str], str]] = {}
     message_type = 'chat'
 
     def __init__(self, core, jid):
@@ -377,8 +377,8 @@ class DynamicConversationTab(ConversationTab):
     bad idea so it has been removed.
     Only one DynamicConversationTab can be opened for a given jid.
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, jid, resource=None):
         self.locked_resource = None
@@ -447,8 +447,8 @@ class StaticConversationTab(ConversationTab):
     A conversation tab associated with one Full JID. It cannot be locked to
     an different resource or unlocked.
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, jid):
         ConversationTab.__init__(self, core, jid)
diff --git a/poezio/tabs/data_forms.py b/poezio/tabs/data_forms.py
index f4ed63e5..8e13a84c 100644
--- a/poezio/tabs/data_forms.py
+++ b/poezio/tabs/data_forms.py
@@ -17,8 +17,8 @@ class DataFormsTab(Tab):
     A tab containing various window type, displaying
     a form that the user needs to fill.
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, form, on_cancel, on_send, kwargs):
         Tab.__init__(self, core)
diff --git a/poezio/tabs/listtab.py b/poezio/tabs/listtab.py
index 87e7d9f4..3489eb9c 100644
--- a/poezio/tabs/listtab.py
+++ b/poezio/tabs/listtab.py
@@ -18,8 +18,8 @@ log = logging.getLogger(__name__)
 
 
 class ListTab(Tab):
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, name, help_message, header_text, cols):
         """Parameters:
diff --git a/poezio/tabs/muclisttab.py b/poezio/tabs/muclisttab.py
index 4c1e492f..f6b3fc35 100644
--- a/poezio/tabs/muclisttab.py
+++ b/poezio/tabs/muclisttab.py
@@ -20,8 +20,8 @@ class MucListTab(ListTab):
     A tab listing rooms from a specific server, displaying various information,
     scrollable, and letting the user join them, etc
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core, server):
         ListTab.__init__(self, core, server.full, "“j”: join room.",
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 182e7145..88fb5419 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -7,6 +7,8 @@ It keeps track of many things such as part/joins, maintains an
 user list, and updates private tabs when necessary.
 """
 
+from __future__ import annotations
+
 import asyncio
 import bisect
 import curses
@@ -78,38 +80,38 @@ class MucTab(ChatTab):
     It contains a userlist, an input, a topic, an information and a chat zone
     """
     message_type = 'groupchat'
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable[..., Any]]
-    additional_information = {}  # type: Dict[str, Callable[[str], str]]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable[..., Any]] = {}
+    additional_information: Dict[str, Callable[[str], str]] = {}
     lagged = False
 
-    def __init__(self, core: 'Core', jid: JID, nick: str, password: Optional[str] = None) -> None:
+    def __init__(self, core: Core, jid: JID, nick: str, password: Optional[str] = None) -> None:
         ChatTab.__init__(self, core, jid)
         self.joined = False
         self._state = 'disconnected'
         # our nick in the MUC
         self.own_nick = nick
         # self User object
-        self.own_user = None  # type: Optional[User]
+        self.own_user: Optional[User] = None
         self.password = password
         # buffered presences
-        self.presence_buffer = []  # type: List[Presence]
+        self.presence_buffer: List[Presence] = []
         # userlist
-        self.users = []  # type: List[User]
+        self.users: List[User] = []
         # private conversations
-        self.privates = []  # type: List[Tab]
+        self.privates: List[Tab] = []
         self.topic = ''
         self.topic_from = ''
         # Self ping event, so we can cancel it when we leave the room
-        self.self_ping_event = None  # type: Optional[timed_events.DelayedEvent]
+        self.self_ping_event: Optional[timed_events.DelayedEvent] = None
         # UI stuff
         self.topic_win = windows.Topic()
         self.v_separator = windows.VerticalSeparator()
         self.user_win = windows.UserList()
         self.info_header = windows.MucInfoWin()
-        self.input = windows.MessageInput()  # type: windows.MessageInput
+        self.input: windows.MessageInput = windows.MessageInput()
         # List of ignored users
-        self.ignores = []  # type: List[User]
+        self.ignores: List[User] = []
         # keys
         self.register_keys()
         self.update_keys()
@@ -149,14 +151,14 @@ class MucTab(ChatTab):
         """
         del MucTab.additional_information[plugin_name]
 
-    def cancel_config(self, form: 'Form') -> None:
+    def cancel_config(self, form: Form) -> None:
         """
         The user do not want to send their config, send an iq cancel
         """
         asyncio.ensure_future(self.core.xmpp['xep_0045'].cancel_config(self.jid.bare))
         self.core.close_tab()
 
-    def send_config(self, form: 'Form') -> None:
+    def send_config(self, form: Form) -> None:
         """
         The user sends their config to the server
         """
@@ -1406,7 +1408,7 @@ class MucTab(ChatTab):
         /configure
         """
 
-        def on_form_received(form: 'Form') -> None:
+        def on_form_received(form: Form) -> None:
             if not form:
                 self.core.information(
                     'Could not retrieve the configuration form', 'Error')
diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index f29e302c..54b9a15d 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -35,10 +35,10 @@ class PrivateTab(OneToOneTab):
     """
     The tab containing a private conversation (someone from a MUC)
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
     message_type = 'chat'
-    additional_information = {}  # type: Dict[str, Callable[[str], str]]
+    additional_information: Dict[str, Callable[[str], str]] = {}
 
     def __init__(self, core, jid, nick):
         OneToOneTab.__init__(self, core, jid)
diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py
index 072e0776..15a59455 100644
--- a/poezio/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
@@ -36,8 +36,8 @@ class RosterInfoTab(Tab):
     """
     A tab, split in two, containing the roster and infos
     """
-    plugin_commands = {}  # type: Dict[str, Command]
-    plugin_keys = {}  # type: Dict[str, Callable]
+    plugin_commands: Dict[str, Command] = {}
+    plugin_keys: Dict[str, Callable] = {}
 
     def __init__(self, core):
         Tab.__init__(self, core)