From e97f055f69e29365c8c20d7705561580267595fe Mon Sep 17 00:00:00 2001 From: wurstsalat Date: Tue, 29 Nov 2022 19:33:51 +0100 Subject: [PATCH] [now_listen] Type annotations, linting --- now_listen/__init__.py | 2 +- now_listen/gtk/config.py | 32 ++++++++++++++++++++++---------- now_listen/now_listen.py | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/now_listen/__init__.py b/now_listen/__init__.py index 3a1040c..1ed78ab 100644 --- a/now_listen/__init__.py +++ b/now_listen/__init__.py @@ -1 +1 @@ -from .now_listen import NowListenPlugin +from .now_listen import NowListenPlugin # type: ignore diff --git a/now_listen/gtk/config.py b/now_listen/gtk/config.py index 74c1307..479c40a 100644 --- a/now_listen/gtk/config.py +++ b/now_listen/gtk/config.py @@ -13,18 +13,26 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see . -from gi.repository import Gtk +from __future__ import annotations -from gajim.gui.settings import SettingsDialog -from gajim.gui.settings import SettingKind -from gajim.gui.const import Setting -from gajim.gui.const import SettingType +from typing import Any +from typing import TYPE_CHECKING + +from gi.repository import Gtk from gajim.plugins.plugins_i18n import _ +from gajim.gui.const import Setting +from gajim.gui.const import SettingKind +from gajim.gui.const import SettingType +from gajim.gui.settings import SettingsDialog + +if TYPE_CHECKING: + from ..now_listen import NowListenPlugin + class NowListenConfigDialog(SettingsDialog): - def __init__(self, plugin, parent): + def __init__(self, plugin: NowListenPlugin, parent: Gtk.Window) -> None: self.plugin = plugin settings = [ @@ -32,11 +40,15 @@ class NowListenConfigDialog(SettingsDialog): _('Format string'), SettingType.VALUE, self.plugin.config['format_string'], - callback=self.on_setting, data='format_string') + callback=self._on_setting, data='format_string') ] - SettingsDialog.__init__(self, parent, _('Now Listen Configuration'), - Gtk.DialogFlags.MODAL, settings, None) + SettingsDialog.__init__(self, + parent, + _('Now Listen Configuration'), + Gtk.DialogFlags.MODAL, + settings, + '') - def on_setting(self, value, data): + def _on_setting(self, value: Any, data: Any) -> None: self.plugin.config[data] = value diff --git a/now_listen/now_listen.py b/now_listen/now_listen.py index 3e43aaf..78c5995 100644 --- a/now_listen/now_listen.py +++ b/now_listen/now_listen.py @@ -40,7 +40,7 @@ log = logging.getLogger('gajim.p.now_listen') class NowListenPlugin(GajimPlugin): - def init(self): + def init(self) -> None: # pylint: disable=attribute-defined-outside-init self.description = _('Copy tune info of playing music to conversation ' 'input box at cursor position (Alt + N)')