From 3f29484895e110834f9d3da80017934e6d3111d5 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 10 Nov 2026 02:59:22 +0900 Subject: [PATCH] chore: drop unused Gtk imports --- dzgui/controllers/emitter.py | 4 ++-- dzgui/controllers/mc.py | 2 +- dzgui/managers/connection.py | 5 ----- dzgui/managers/mods.py | 2 +- dzgui/managers/threading.py | 2 +- dzgui/managers/update.py | 5 ----- dzgui/model/model_factory.py | 4 ++-- dzgui/model/servers.py | 2 +- dzgui/util/clip.py | 3 +-- dzgui/util/css.py | 2 +- dzgui/util/dist.py | 5 ----- dzgui/util/format.py | 2 +- dzgui/util/keys.py | 5 ++++- dzgui/util/margins.py | 4 +++- dzgui/util/save_screenshot.py | 2 +- dzgui/views/base.py | 2 +- dzgui/views/components/buttonbox.py | 2 +- dzgui/views/components/buttons.py | 2 +- dzgui/views/components/connect_panel.py | 2 +- dzgui/views/components/crumbs.py | 2 +- dzgui/views/components/entry.py | 2 +- dzgui/views/components/eventbox.py | 2 +- dzgui/views/components/filter_panel.py | 7 +++++-- dzgui/views/components/icon.py | 2 +- dzgui/views/components/labels.py | 2 +- dzgui/views/components/maps_combo.py | 2 +- dzgui/views/components/mod_panel.py | 2 +- dzgui/views/components/right_panel.py | 2 +- dzgui/views/components/statusbar.py | 2 +- dzgui/views/components/toast.py | 3 ++- dzgui/views/dialogs/calc.py | 2 +- dzgui/views/dialogs/early_alert.py | 2 +- dzgui/views/dialogs/filepicker.py | 4 ++-- dzgui/views/dialogs/generic.py | 2 +- dzgui/views/dialogs/link_dialog.py | 2 +- dzgui/views/dialogs/note.py | 4 ++-- dzgui/views/dialogs/uninstall.py | 2 +- dzgui/views/dialogs/wizard.py | 4 ++-- dzgui/views/mixins/context_mixin.py | 2 +- dzgui/views/mixins/cursor_mixin.py | 2 +- dzgui/views/mixins/mods_mixin.py | 2 +- dzgui/views/pages/changelog.py | 2 +- dzgui/views/pages/devs.py | 4 ++-- dzgui/views/pages/help.py | 2 +- dzgui/views/pages/keys.py | 2 +- dzgui/views/pages/log.py | 2 +- dzgui/views/pages/preconnect.py | 2 +- dzgui/views/pages/servers.py | 2 +- dzgui/views/pages/thanks.py | 2 +- dzgui/views/trees/tree_log.py | 2 +- pyproject.toml | 1 + tests/test_html_escaping.py | 2 +- 52 files changed, 65 insertions(+), 71 deletions(-) diff --git a/dzgui/controllers/emitter.py b/dzgui/controllers/emitter.py index 82b0e91..e21ac18 100644 --- a/dzgui/controllers/emitter.py +++ b/dzgui/controllers/emitter.py @@ -3,8 +3,8 @@ from typing import TYPE_CHECKING import gi gi.require_version("Gtk", "3.0") -from gi.repository.Gtk import ListStore # noqa E402 -from gi.repository import Gdk, GObject # noqa E402 +from gi.repository.Gtk import ListStore +from gi.repository import GObject if TYPE_CHECKING: from dzgui.const.enum import NotebookPage, ServerTab diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 1a05955..5c5a532 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -32,7 +32,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GLib, GObject # noqa E402 +from gi.repository import Gtk, Gdk, GLib, GObject logger = logging.getLogger(APP_NAME) diff --git a/dzgui/managers/connection.py b/dzgui/managers/connection.py index 89c35f0..cb9faf2 100644 --- a/dzgui/managers/connection.py +++ b/dzgui/managers/connection.py @@ -55,11 +55,6 @@ from dzgui.util.symlink import rebuild_symlinks from dzgui.views.dialogs.generic import ExceptionDialog from dzgui.views.dialogs.servers import ServerDetailsDialog, ServerModDialog -import gi - -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 - if TYPE_CHECKING: from dzgui.api.servers import A2SInfo, Record from dzgui.controllers.mc import Controller diff --git a/dzgui/managers/mods.py b/dzgui/managers/mods.py index 6a98e02..421a95f 100644 --- a/dzgui/managers/mods.py +++ b/dzgui/managers/mods.py @@ -30,7 +30,7 @@ import dzgui.api.pefile as PeFile import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/managers/threading.py b/dzgui/managers/threading.py index c20f324..43b89aa 100644 --- a/dzgui/managers/threading.py +++ b/dzgui/managers/threading.py @@ -15,7 +15,7 @@ if TYPE_CHECKING: import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 +from gi.repository import GLib logger = logging.getLogger(APP_NAME) diff --git a/dzgui/managers/update.py b/dzgui/managers/update.py index ff64fb4..f519c4f 100644 --- a/dzgui/managers/update.py +++ b/dzgui/managers/update.py @@ -15,11 +15,6 @@ from dzgui.strings import dialogs from dzgui.managers.threading import call_on_thread, StoredFunc, ThreadingManager from dzgui.views.dialogs.generic import ExceptionDialog, QuitDialog -import gi - -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 - if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/model/model_factory.py b/dzgui/model/model_factory.py index 7dfffbf..dc90f86 100644 --- a/dzgui/model/model_factory.py +++ b/dzgui/model/model_factory.py @@ -7,8 +7,8 @@ from dzgui.util.strings import delimiter import gi gi.require_version("Gtk", "3.0") -from gi.repository.Gtk import ListStore, TreeIter # noqa E402 -from gi.repository import GObject # noqa E402 +from gi.repository.Gtk import ListStore, TreeIter +from gi.repository import GObject GTYPE_TO_PYTHON = { GObject.type_from_name(GObject.type_name(ptype)): ptype diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py index a1d3082..93f2fce 100644 --- a/dzgui/model/servers.py +++ b/dzgui/model/servers.py @@ -21,7 +21,7 @@ from dzgui.views.dialogs.generic import ExceptionDialog import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 +from gi.repository import Gtk, GLib if TYPE_CHECKING: from dzgui.api.servers import A2SInfo, Record diff --git a/dzgui/util/clip.py b/dzgui/util/clip.py index 971515c..991346d 100644 --- a/dzgui/util/clip.py +++ b/dzgui/util/clip.py @@ -1,8 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -gi.require_version("Gdk", "3.0") -from gi.repository import Gtk, Gdk # noqa E402 +from gi.repository import Gtk, Gdk def copy_clipboard(text: str) -> None: diff --git a/dzgui/util/css.py b/dzgui/util/css.py index 44bf7cd..2350be7 100644 --- a/dzgui/util/css.py +++ b/dzgui/util/css.py @@ -5,7 +5,7 @@ from dzgui.const.constants import APP_NAME_LOWER, CSS_PATH import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa E402 +from gi.repository import Gtk, Gdk def add_class(widget: Gtk.Widget, label: str) -> None: diff --git a/dzgui/util/dist.py b/dzgui/util/dist.py index 46c2d44..86f9aa1 100644 --- a/dzgui/util/dist.py +++ b/dzgui/util/dist.py @@ -7,11 +7,6 @@ from dzgui.const.constants import APP_NAME from dzgui.util.ip import get_coords from dzgui.util.localize import number -import gi - -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 - if TYPE_CHECKING: from queue import Queue from dzgui.const.enum import ServerTab diff --git a/dzgui/util/format.py b/dzgui/util/format.py index e7b4d07..3d75e30 100644 --- a/dzgui/util/format.py +++ b/dzgui/util/format.py @@ -7,7 +7,7 @@ from dzgui.util.strings import no_mods, no_servers, workshop import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk def format_pango(text: str) -> str: diff --git a/dzgui/util/keys.py b/dzgui/util/keys.py index 04f291d..5293d21 100644 --- a/dzgui/util/keys.py +++ b/dzgui/util/keys.py @@ -1,6 +1,8 @@ import gi + gi.require_version("Gtk", "3.0") -from gi.repository import Gdk # noqa E402 +from gi.repository import Gdk + def is_navkey(key: int) -> bool: nav_keys = [ @@ -18,6 +20,7 @@ def is_navkey(key: int) -> bool: return True return False + def is_ctrl_mask(event: Gdk.EventKey) -> bool: if event.state is Gdk.ModifierType.CONTROL_MASK: return True diff --git a/dzgui/util/margins.py b/dzgui/util/margins.py index f4f8883..82cef96 100644 --- a/dzgui/util/margins.py +++ b/dzgui/util/margins.py @@ -1,6 +1,8 @@ import gi + gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk + def set_surrounding_margins(widget: Gtk.Widget, margin: int) -> None: """ diff --git a/dzgui/util/save_screenshot.py b/dzgui/util/save_screenshot.py index 8c106bc..ffa769f 100644 --- a/dzgui/util/save_screenshot.py +++ b/dzgui/util/save_screenshot.py @@ -4,7 +4,7 @@ from typing import cast, TYPE_CHECKING import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GLib # noqa E402 +from gi.repository import Gdk, GLib if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/base.py b/dzgui/views/base.py index 79fde50..4ce0286 100644 --- a/dzgui/views/base.py +++ b/dzgui/views/base.py @@ -38,7 +38,7 @@ import gi gi.require_version("Gtk", "3.0") gi.require_version("GLibUnix", "2.0") -from gi.repository import Gtk, GLib, GLibUnix, Gdk # type: ignore # noqa E402 +from gi.repository import Gtk, GLib, GLibUnix, Gdk if TYPE_CHECKING: from dzgui.config.userprefs import UserPrefs diff --git a/dzgui/views/components/buttonbox.py b/dzgui/views/components/buttonbox.py index 496f237..fedad93 100644 --- a/dzgui/views/components/buttonbox.py +++ b/dzgui/views/components/buttonbox.py @@ -7,7 +7,7 @@ from dzgui.const.enum import ButtonType import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa E402 +from gi.repository import Gtk, Gdk logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/components/buttons.py b/dzgui/views/components/buttons.py index bb3d45d..3bc72fa 100644 --- a/dzgui/views/components/buttons.py +++ b/dzgui/views/components/buttons.py @@ -22,7 +22,7 @@ from dzgui.strings import connect_panel import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GLib # noqa E402 +from gi.repository import Gtk, GLib if TYPE_CHECKING: from gi.repository import GLib diff --git a/dzgui/views/components/connect_panel.py b/dzgui/views/components/connect_panel.py index 17d0a71..0e1440c 100644 --- a/dzgui/views/components/connect_panel.py +++ b/dzgui/views/components/connect_panel.py @@ -18,7 +18,7 @@ from dzgui.views.components.labels import BoldLabel import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa E402 +from gi.repository import Gtk, Gdk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/crumbs.py b/dzgui/views/components/crumbs.py index cd57426..610f8d6 100644 --- a/dzgui/views/components/crumbs.py +++ b/dzgui/views/components/crumbs.py @@ -7,7 +7,7 @@ from dzgui.util.format import embolden import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/entry.py b/dzgui/views/components/entry.py index e1b3e7e..47a036a 100644 --- a/dzgui/views/components/entry.py +++ b/dzgui/views/components/entry.py @@ -9,7 +9,7 @@ from dzgui.strings.errors import api_popover import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GObject # noqa E402 +from gi.repository import Gtk, Gdk, GObject if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/eventbox.py b/dzgui/views/components/eventbox.py index 5e06127..586b48e 100644 --- a/dzgui/views/components/eventbox.py +++ b/dzgui/views/components/eventbox.py @@ -6,7 +6,7 @@ from dzgui.const.constants import HELP_BUBBLE import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa E402 +from gi.repository import Gtk, Gdk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/filter_panel.py b/dzgui/views/components/filter_panel.py index 75c51e9..fa996c0 100644 --- a/dzgui/views/components/filter_panel.py +++ b/dzgui/views/components/filter_panel.py @@ -17,7 +17,7 @@ from dzgui.views.components.labels import BoldLabel import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, Pango, GLib # noqa E402 +from gi.repository import Gtk, Gdk, Pango, GLib logger = logging.getLogger(APP_NAME) @@ -42,7 +42,10 @@ class ButtonGrid(Gtk.Grid): self.checks: list[Gtk.CheckButton] = [] flowbox = Gtk.FlowBox( - halign=Gtk.Align.CENTER, min_children_per_line=3, max_children_per_line=3, selection_mode=Gtk.SelectionMode.NONE + halign=Gtk.Align.CENTER, + min_children_per_line=3, + max_children_per_line=3, + selection_mode=Gtk.SelectionMode.NONE, ) for check in defaults.keys(): diff --git a/dzgui/views/components/icon.py b/dzgui/views/components/icon.py index 2cb222d..54b88d9 100644 --- a/dzgui/views/components/icon.py +++ b/dzgui/views/components/icon.py @@ -1,7 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk class Icon(Gtk.Image): diff --git a/dzgui/views/components/labels.py b/dzgui/views/components/labels.py index 9ecc52a..a9c7db0 100644 --- a/dzgui/views/components/labels.py +++ b/dzgui/views/components/labels.py @@ -3,7 +3,7 @@ from dzgui.util.format import embolden import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk class BoldLabel(Gtk.Label): diff --git a/dzgui/views/components/maps_combo.py b/dzgui/views/components/maps_combo.py index 0eea10f..821b831 100644 --- a/dzgui/views/components/maps_combo.py +++ b/dzgui/views/components/maps_combo.py @@ -1,7 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 +from gi.repository import Gtk class MapsCombo(Gtk.EntryCompletion): diff --git a/dzgui/views/components/mod_panel.py b/dzgui/views/components/mod_panel.py index 7c913c4..bcc74b7 100644 --- a/dzgui/views/components/mod_panel.py +++ b/dzgui/views/components/mod_panel.py @@ -8,7 +8,7 @@ from dzgui.views.components.labels import BoldLabel import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/right_panel.py b/dzgui/views/components/right_panel.py index f38def4..08b6681 100644 --- a/dzgui/views/components/right_panel.py +++ b/dzgui/views/components/right_panel.py @@ -23,7 +23,7 @@ from dzgui.views.components.buttons import IconTextButton, RefreshButton, KeysBu import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GLib # noqa E402 +from gi.repository import Gtk, Gdk, GLib if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/components/statusbar.py b/dzgui/views/components/statusbar.py index 7eb75a3..6726021 100644 --- a/dzgui/views/components/statusbar.py +++ b/dzgui/views/components/statusbar.py @@ -7,7 +7,7 @@ from dzgui.views.components.buttons import LoggerAlertsButton import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.const.enum import ServerTab diff --git a/dzgui/views/components/toast.py b/dzgui/views/components/toast.py index d6fd577..95e663f 100644 --- a/dzgui/views/components/toast.py +++ b/dzgui/views/components/toast.py @@ -2,8 +2,9 @@ from typing import Literal from dzgui.util import css import gi + gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib # noqa E402 +from gi.repository import Gtk, GLib class Toast(Gtk.EventBox): diff --git a/dzgui/views/dialogs/calc.py b/dzgui/views/dialogs/calc.py index 979cb0a..e5d6819 100644 --- a/dzgui/views/dialogs/calc.py +++ b/dzgui/views/dialogs/calc.py @@ -10,7 +10,7 @@ from dzgui.views.components.labels import BoldLabel from dzgui.views.components.box import VBox, HBox gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, GObject # type: ignore # noqa E402 +from gi.repository import Gtk, GLib, GObject DAY_START_TIME = time(hour=6, minute=0, second=0) DAY_END_TIME = time(hour=18, minute=0, second=0) diff --git a/dzgui/views/dialogs/early_alert.py b/dzgui/views/dialogs/early_alert.py index b7032a0..702560b 100644 --- a/dzgui/views/dialogs/early_alert.py +++ b/dzgui/views/dialogs/early_alert.py @@ -8,7 +8,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk class AbortDialog(ColorAwareApp, Gtk.MessageDialog): # type: ignore diff --git a/dzgui/views/dialogs/filepicker.py b/dzgui/views/dialogs/filepicker.py index 2048598..15371c3 100644 --- a/dzgui/views/dialogs/filepicker.py +++ b/dzgui/views/dialogs/filepicker.py @@ -2,10 +2,10 @@ from pathlib import Path from dzgui.util.strings import picker -import gi # noqa E402 +import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk class FilePicker(Gtk.FileChooserDialog): diff --git a/dzgui/views/dialogs/generic.py b/dzgui/views/dialogs/generic.py index cff1e2a..65b79d5 100644 --- a/dzgui/views/dialogs/generic.py +++ b/dzgui/views/dialogs/generic.py @@ -8,7 +8,7 @@ from dzgui.views.components.buttons import ClipboardButton import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk, GLib if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/dialogs/link_dialog.py b/dzgui/views/dialogs/link_dialog.py index 294765c..1a5d6ff 100644 --- a/dzgui/views/dialogs/link_dialog.py +++ b/dzgui/views/dialogs/link_dialog.py @@ -9,7 +9,7 @@ from dzgui.views.components.buttons import SteamTextButton import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: diff --git a/dzgui/views/dialogs/note.py b/dzgui/views/dialogs/note.py index b595e90..a1cf7fb 100644 --- a/dzgui/views/dialogs/note.py +++ b/dzgui/views/dialogs/note.py @@ -3,10 +3,10 @@ from typing import Self, TYPE_CHECKING from dzgui.views.components.entry import ValidatedEntry from dzgui.views.dialogs.generic import GenericDialog -import gi # noqa E402 +import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gdk, Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/dialogs/uninstall.py b/dzgui/views/dialogs/uninstall.py index 3e7d2e7..c649c8a 100644 --- a/dzgui/views/dialogs/uninstall.py +++ b/dzgui/views/dialogs/uninstall.py @@ -18,7 +18,7 @@ from dzgui.views.mixins.colorscheme import ColorAwareApp import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Pango # noqa E402 +from gi.repository import Gtk, GLib, Pango class Assistant(Gtk.Assistant): diff --git a/dzgui/views/dialogs/wizard.py b/dzgui/views/dialogs/wizard.py index 5dbcdb4..b3aa618 100644 --- a/dzgui/views/dialogs/wizard.py +++ b/dzgui/views/dialogs/wizard.py @@ -14,7 +14,7 @@ from dzgui.const.constants import ( HERO_PATH, FLATPAK_ROOT_PATH, LEGACY_CONFIG_PATH, - TMP_PATH + TMP_PATH, ) from dzgui.const.boilerplate import config_boilerplate from dzgui.const.endpoints import STEAM_API_SETUP @@ -35,7 +35,7 @@ from dzgui.views.trees.tree_simple import SimpleTree import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gdk, Gtk, GLib, GObject, GdkPixbuf # noqa E402 +from gi.repository import Gtk, GLib, GObject, GdkPixbuf if TYPE_CHECKING: from dzgui.config.xdg import Xdg diff --git a/dzgui/views/mixins/context_mixin.py b/dzgui/views/mixins/context_mixin.py index 5befa2c..9a92739 100644 --- a/dzgui/views/mixins/context_mixin.py +++ b/dzgui/views/mixins/context_mixin.py @@ -9,7 +9,7 @@ from dzgui.views.trees.tree_base import TreeView import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk, Gdk logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/mixins/cursor_mixin.py b/dzgui/views/mixins/cursor_mixin.py index 71d4851..0690e19 100644 --- a/dzgui/views/mixins/cursor_mixin.py +++ b/dzgui/views/mixins/cursor_mixin.py @@ -5,7 +5,7 @@ from dzgui.util.keys import is_ctrl_mask import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk, Gdk class CursorMixin: diff --git a/dzgui/views/mixins/mods_mixin.py b/dzgui/views/mixins/mods_mixin.py index 6cc7da8..1b76321 100644 --- a/dzgui/views/mixins/mods_mixin.py +++ b/dzgui/views/mixins/mods_mixin.py @@ -3,7 +3,7 @@ from dzgui.views.trees.tree_base import TreeView import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk class ModsMixin: diff --git a/dzgui/views/pages/changelog.py b/dzgui/views/pages/changelog.py index 108912c..86a7d32 100644 --- a/dzgui/views/pages/changelog.py +++ b/dzgui/views/pages/changelog.py @@ -15,7 +15,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/pages/devs.py b/dzgui/views/pages/devs.py index 7c95255..3eccae8 100644 --- a/dzgui/views/pages/devs.py +++ b/dzgui/views/pages/devs.py @@ -7,10 +7,10 @@ from dzgui.util.strings import developers from dzgui.views.components.labels import BoldLabel from dzgui.views.trees.tree_base import TreeView -import gi # noqa E402 +import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/help.py b/dzgui/views/pages/help.py index bcfbfd8..e4b1f17 100644 --- a/dzgui/views/pages/help.py +++ b/dzgui/views/pages/help.py @@ -4,7 +4,7 @@ from dzgui.views.trees.tree_menu import MenuTreeView import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/keys.py b/dzgui/views/pages/keys.py index ea12476..92bea81 100644 --- a/dzgui/views/pages/keys.py +++ b/dzgui/views/pages/keys.py @@ -7,7 +7,7 @@ from dzgui.util.css import add_class import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/log.py b/dzgui/views/pages/log.py index a9e1bd5..aad06a6 100644 --- a/dzgui/views/pages/log.py +++ b/dzgui/views/pages/log.py @@ -9,7 +9,7 @@ from dzgui.views.trees.tree_log import LogTreeView import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/preconnect.py b/dzgui/views/pages/preconnect.py index b737ff0..686dc2f 100644 --- a/dzgui/views/pages/preconnect.py +++ b/dzgui/views/pages/preconnect.py @@ -18,7 +18,7 @@ from dzgui.views.trees.tree_server_mods import ServerModTreeView import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gdk, Gtk # noqa E402 +from gi.repository import Gdk, Gtk if TYPE_CHECKING: diff --git a/dzgui/views/pages/servers.py b/dzgui/views/pages/servers.py index caefe21..61e333b 100644 --- a/dzgui/views/pages/servers.py +++ b/dzgui/views/pages/servers.py @@ -10,7 +10,7 @@ from dzgui.util.strings import server_labels import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GLib # noqa E402 +from gi.repository import Gtk, Gdk logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/pages/thanks.py b/dzgui/views/pages/thanks.py index 4adc39c..88e4256 100644 --- a/dzgui/views/pages/thanks.py +++ b/dzgui/views/pages/thanks.py @@ -8,7 +8,7 @@ from dzgui.views.mixins.scrollable_mixin import ScrollableMixin import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk # TODO: wrap and center long values if TYPE_CHECKING: diff --git a/dzgui/views/trees/tree_log.py b/dzgui/views/trees/tree_log.py index 7f141ef..fd4279d 100644 --- a/dzgui/views/trees/tree_log.py +++ b/dzgui/views/trees/tree_log.py @@ -12,7 +12,7 @@ from dzgui.views.mixins.context_mixin import ContextMixin import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa E402 +from gi.repository import Gtk, Gdk if TYPE_CHECKING: from pathlib import Path diff --git a/pyproject.toml b/pyproject.toml index 7d97ce6..d5780c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,6 +78,7 @@ line-length = 88 indent-width = 4 extend-exclude = ["*lib/a2s"] lint.unfixable = ["F401", "I001"] +ignore = ["E402"] [tool.ruff.format] quote-style = "double" diff --git a/tests/test_html_escaping.py b/tests/test_html_escaping.py index 904e5b2..2c3c03c 100644 --- a/tests/test_html_escaping.py +++ b/tests/test_html_escaping.py @@ -6,7 +6,7 @@ from dzgui.views.dialogs.servers import ServerDetailsDialog import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa E402 +from gi.repository import Gtk class MockController: