From b98a6f95a6e1370d5a206a3f127f258665f9573c Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Wed, 11 Nov 2026 07:00:17 +0900 Subject: [PATCH] drop: unused imports --- dzgui/api/mods.py | 1 - dzgui/app_init.py | 3 +-- dzgui/controllers/mc.py | 11 +++-------- dzgui/views/components/box.py | 6 +++--- dzgui/views/components/frame.py | 9 +++++---- dzgui/views/components/misc.py | 5 ++--- dzgui/views/components/scrollable.py | 2 +- dzgui/views/dialogs/boot.py | 16 +++++----------- dzgui/views/dialogs/servers.py | 2 +- dzgui/views/mixins/colorscheme.py | 6 +++--- dzgui/views/mixins/help_menu_mixin.py | 2 +- dzgui/views/mixins/scrollable_mixin.py | 6 +++--- dzgui/views/pages/mods.py | 5 ++--- dzgui/views/pages/offline.py | 12 ++++++------ dzgui/views/pages/options.py | 11 ++++------- dzgui/views/trees/tree_base.py | 5 ++--- dzgui/views/trees/tree_menu.py | 2 +- dzgui/views/trees/tree_mods.py | 6 +++--- dzgui/views/trees/tree_server_mods.py | 10 +++++----- dzgui/views/trees/tree_servers.py | 12 ++++-------- dzgui/views/trees/tree_simple.py | 10 +++++----- tests/test_colorscheme.py | 5 ++--- 22 files changed, 62 insertions(+), 85 deletions(-) diff --git a/dzgui/api/mods.py b/dzgui/api/mods.py index 234835d..1d59528 100644 --- a/dzgui/api/mods.py +++ b/dzgui/api/mods.py @@ -3,7 +3,6 @@ import logging import re from concurrent.futures import ThreadPoolExecutor, wait -from dataclasses import dataclass from pathlib import Path from typing import Any diff --git a/dzgui/app_init.py b/dzgui/app_init.py index 96ff4d1..30e3a6d 100644 --- a/dzgui/app_init.py +++ b/dzgui/app_init.py @@ -6,7 +6,6 @@ from importlib import resources from pathlib import Path from typing import TYPE_CHECKING - from dzgui.const.constants import ( APP_NAME, APP_NAME_LOWER, @@ -107,7 +106,7 @@ def load_steam_icon() -> None: import gi gi.require_version("Gtk", "3.0") - from gi.repository import Gtk # noqa + from gi.repository import Gtk try: traversable = resources.files(APP_NAME_LOWER).joinpath(ICONS_PATH) diff --git a/dzgui/controllers/mc.py b/dzgui/controllers/mc.py index 58de7d2..151e6ed 100644 --- a/dzgui/controllers/mc.py +++ b/dzgui/controllers/mc.py @@ -1,11 +1,11 @@ +import gi import logging import threading from typing import Any, TYPE_CHECKING, Union -import dzgui.util._json as JSON # noqa - - +from dzgui.config.userprefs import UserPrefs +from dzgui.const.constants import APP_NAME from dzgui.const.enum import ( ButtonType, ContextMenuItem, @@ -14,9 +14,6 @@ from dzgui.const.enum import ( Preferences, ServerTab, ) - -from dzgui.config.userprefs import UserPrefs -from dzgui.const.constants import APP_NAME from dzgui.controllers.emitter import Emitter from dzgui.managers.config import ConfigManager from dzgui.managers.connection import ConnectionManager @@ -29,8 +26,6 @@ from dzgui.util.open_links import open_user_workshop, open_workshop_page from dzgui.views.dialogs.filepicker import FilePicker from dzgui.views.dialogs.generic import ExceptionDialog -import gi - gi.require_version("Gtk", "3.0") from gi.repository import Gtk, Gdk, GLib, GObject diff --git a/dzgui/views/components/box.py b/dzgui/views/components/box.py index d581255..b48b29a 100644 --- a/dzgui/views/components/box.py +++ b/dzgui/views/components/box.py @@ -1,9 +1,9 @@ -from typing import Sequence - import gi +from typing import Sequence + gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa +from gi.repository import Gtk class GenericBox(Gtk.Box): diff --git a/dzgui/views/components/frame.py b/dzgui/views/components/frame.py index dab2671..e245dff 100644 --- a/dzgui/views/components/frame.py +++ b/dzgui/views/components/frame.py @@ -1,10 +1,11 @@ -from typing import Self -from dzgui.util import css - import gi +from typing import Self + +from dzgui.util import css + gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa +from gi.repository import Gtk # TODO: subclass Gtk.Frame directly diff --git a/dzgui/views/components/misc.py b/dzgui/views/components/misc.py index 80e694e..dbef1f6 100644 --- a/dzgui/views/components/misc.py +++ b/dzgui/views/components/misc.py @@ -1,3 +1,4 @@ +import gi from typing import Self from warnings import deprecated @@ -8,10 +9,8 @@ from dzgui.strings import options from dzgui.views.components.box import HBox from dzgui.views.components.buttons import Icon -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa +from gi.repository import Gtk @deprecated("Client choice is determined at setup time") diff --git a/dzgui/views/components/scrollable.py b/dzgui/views/components/scrollable.py index 294ca53..c592549 100644 --- a/dzgui/views/components/scrollable.py +++ b/dzgui/views/components/scrollable.py @@ -1,7 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa +from gi.repository import Gtk class NoOverlayScrolledWindow(Gtk.ScrolledWindow): diff --git a/dzgui/views/dialogs/boot.py b/dzgui/views/dialogs/boot.py index bfc0b1e..5a8a718 100644 --- a/dzgui/views/dialogs/boot.py +++ b/dzgui/views/dialogs/boot.py @@ -1,13 +1,9 @@ +import gi import sys + +from enum import Enum from typing import Any, Literal, Self, TYPE_CHECKING -# import time -from enum import Enum - - -from dzgui.views.mixins.colorscheme import ColorAwareApp - -# TODO: import dialog titles from dzgui.api.mods import remove_stale_signatures as remove_stale from dzgui.config.ipdb import get_ipdb from dzgui.const.constants import HEX_GREEN, HEX_RED @@ -20,12 +16,10 @@ from dzgui.util.format import format_exception from dzgui.util.strings import dialog_header from dzgui.util.symlink import rebuild_symlinks from dzgui.views.components.buttons import ClipboardButton - - -import gi +from dzgui.views.mixins.colorscheme import ColorAwareApp gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk # noqa +from gi.repository import Gtk, GLib, Gdk if TYPE_CHECKING: from dzgui.config.xdg import Xdg diff --git a/dzgui/views/dialogs/servers.py b/dzgui/views/dialogs/servers.py index b58d352..643d132 100644 --- a/dzgui/views/dialogs/servers.py +++ b/dzgui/views/dialogs/servers.py @@ -15,7 +15,7 @@ from dzgui.views.dialogs.generic import GenericDialog from dzgui.views.trees.tree_base import TreeView gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, Pango # noqa +from gi.repository import Gtk, Gdk, Pango if TYPE_CHECKING: from dzgui.api.servers import Details diff --git a/dzgui/views/mixins/colorscheme.py b/dzgui/views/mixins/colorscheme.py index 2e0be9c..f70a1bd 100644 --- a/dzgui/views/mixins/colorscheme.py +++ b/dzgui/views/mixins/colorscheme.py @@ -1,3 +1,5 @@ +import gi + from typing import Any from dzgui.const.constants import ( @@ -7,10 +9,8 @@ from dzgui.const.constants import ( GIO_SETTINGS_VAL, ) -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gio # noqa +from gi.repository import Gtk, Gio class ColorAwareApp: diff --git a/dzgui/views/mixins/help_menu_mixin.py b/dzgui/views/mixins/help_menu_mixin.py index d287bb7..5ef6fda 100644 --- a/dzgui/views/mixins/help_menu_mixin.py +++ b/dzgui/views/mixins/help_menu_mixin.py @@ -1,7 +1,7 @@ import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa +from gi.repository import Gtk, Gdk class HelpMenuMixin: diff --git a/dzgui/views/mixins/scrollable_mixin.py b/dzgui/views/mixins/scrollable_mixin.py index 79d83b8..db99c81 100644 --- a/dzgui/views/mixins/scrollable_mixin.py +++ b/dzgui/views/mixins/scrollable_mixin.py @@ -1,10 +1,10 @@ +import gi + from dzgui.const.enum import VAdjustment from dzgui.const.constants import SCROLL_INCREMENT -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa +from gi.repository import Gtk, Gdk class ScrollableMixin: diff --git a/dzgui/views/pages/mods.py b/dzgui/views/pages/mods.py index 05696a7..5903091 100644 --- a/dzgui/views/pages/mods.py +++ b/dzgui/views/pages/mods.py @@ -1,3 +1,4 @@ +import gi from pathlib import Path from typing import Self, TYPE_CHECKING @@ -8,10 +9,8 @@ from dzgui.views.components.buttons import SteamWorkshopButton from dzgui.views.components.scrollable import NoOverlayScrolledWindow from dzgui.views.trees.tree_mods import ModTreeView -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa +from gi.repository import Gtk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/offline.py b/dzgui/views/pages/offline.py index ceb5686..141c722 100644 --- a/dzgui/views/pages/offline.py +++ b/dzgui/views/pages/offline.py @@ -1,9 +1,10 @@ from __future__ import annotations + +import gi + from enum import Enum from typing import Self, TYPE_CHECKING, Union -from dzgui.util import css -from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING from dzgui.const.constants import ( APPID_DAYZ, APPID_DAYZ_EXP, @@ -11,8 +12,10 @@ from dzgui.const.constants import ( APPNAME_DAYZ_EXP_HUMAN, ) from dzgui.const.enum import ContextMenuGroup, NotebookPage +from dzgui.const.icons import ICON_EDIT_DELETE, ICON_FOLDER, ICON_WARNING from dzgui.managers.offline import OfflineManager from dzgui.strings import generic, offline +from dzgui.util import css from dzgui.views.components.box import HBox, VBox from dzgui.views.components.buttons import Icon, IconTextButton from dzgui.views.components.eventbox import InfoEventBox @@ -21,11 +24,8 @@ from dzgui.views.components.scrollable import NoOverlayScrolledWindow from dzgui.views.components.misc import ErrorPopover from dzgui.views.trees.tree_mods import OfflineModTreeView - -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk, GObject # noqa +from gi.repository import Gtk, Gdk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/pages/options.py b/dzgui/views/pages/options.py index 1fa3fbb..533fa67 100644 --- a/dzgui/views/pages/options.py +++ b/dzgui/views/pages/options.py @@ -1,9 +1,10 @@ +import gi + from pathlib import Path from typing import Any, Callable, TYPE_CHECKING from dzgui.api import pefile as PeFile from dzgui.api.steam import get_last_updated - from dzgui.config import query from dzgui.const.constants import ( APPID_DAYZ, @@ -14,12 +15,11 @@ from dzgui.const.constants import ( FLATPAK_SANDBOX, FLATPAK_STEAM_PATH, ) -from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL from dzgui.const.endpoints import STEAM_API_SETUP from dzgui.const.enum import Preferences, ServerTab +from dzgui.const.icons import ICON_VIEW_CONCEAL, ICON_VIEW_REVEAL from dzgui.strings import options from dzgui.util import strings, css, open_links - from dzgui.views.components.box import ShortHBox, VBox from dzgui.views.components.eventbox import InfoEventBox from dzgui.views.components.labels import LeftLabel @@ -29,11 +29,8 @@ from dzgui.views.components.misc import ErrorPopover from dzgui.views.dialogs.generic import ExceptionDialog from dzgui.views.mixins.scrollable_mixin import ScrollableMixin - -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gdk # noqa +from gi.repository import Gtk, Gdk if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/trees/tree_base.py b/dzgui/views/trees/tree_base.py index 0919b08..a8d134e 100644 --- a/dzgui/views/trees/tree_base.py +++ b/dzgui/views/trees/tree_base.py @@ -1,3 +1,4 @@ +import gi import logging from typing import Any, Optional, TYPE_CHECKING @@ -6,10 +7,8 @@ from dzgui.const.constants import APP_NAME, SEPARATOR from dzgui.util.keys import is_ctrl_mask, is_navkey from dzgui.views.mixins.cursor_mixin import CursorMixin -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa +from gi.repository import Gtk, Gdk, GObject logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/trees/tree_menu.py b/dzgui/views/trees/tree_menu.py index a0964bc..c64b371 100644 --- a/dzgui/views/trees/tree_menu.py +++ b/dzgui/views/trees/tree_menu.py @@ -10,7 +10,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 +from gi.repository import Gtk logger = logging.getLogger(APP_NAME) diff --git a/dzgui/views/trees/tree_mods.py b/dzgui/views/trees/tree_mods.py index 64dd55c..aa48c38 100644 --- a/dzgui/views/trees/tree_mods.py +++ b/dzgui/views/trees/tree_mods.py @@ -1,4 +1,6 @@ +import gi import logging + from typing import Any, TYPE_CHECKING from dzgui.const.constants import APP_NAME, HEX_RED @@ -9,10 +11,8 @@ from dzgui.views.mixins.context_mixin import ContextMixin from dzgui.views.mixins.mods_mixin import ModsMixin 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 +from gi.repository import Gtk, Gdk if TYPE_CHECKING: diff --git a/dzgui/views/trees/tree_server_mods.py b/dzgui/views/trees/tree_server_mods.py index fe1169c..6b6ca07 100644 --- a/dzgui/views/trees/tree_server_mods.py +++ b/dzgui/views/trees/tree_server_mods.py @@ -1,15 +1,15 @@ +import gi + +from typing import TYPE_CHECKING + from dzgui.const.enum import ContextMenuGroup from dzgui.model.model_factory import ModelFactory from dzgui.strings import server_mods from dzgui.views.mixins.context_mixin import ContextMixin from dzgui.views.trees.tree_base import TreeView -from typing import TYPE_CHECKING - -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, Pango # noqa +from gi.repository import Gtk, Pango if TYPE_CHECKING: from dzgui.controllers.mc import Controller diff --git a/dzgui/views/trees/tree_servers.py b/dzgui/views/trees/tree_servers.py index 37210cb..349c19b 100644 --- a/dzgui/views/trees/tree_servers.py +++ b/dzgui/views/trees/tree_servers.py @@ -1,8 +1,9 @@ +import gi import logging import threading from queue import Queue -from typing import Any, Self, Union +from typing import Any, Literal, Self, TYPE_CHECKING, Union from warnings import deprecated from dzgui.api.servers import ping, Record @@ -14,17 +15,11 @@ from dzgui.util import strings from dzgui.util.dist import CalcDist from dzgui.util.keys import is_ctrl_mask from dzgui.views.mixins.context_mixin import ContextMixin -from typing import Literal, TYPE_CHECKING - - from dzgui.views.trees.tree_base import TreeView import dzgui.util._json as JSON # noqa -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk, GObject, Pango # noqa - +from gi.repository import Gtk, GLib, Gdk, GObject logger = logging.getLogger(APP_NAME) @@ -415,6 +410,7 @@ class ServerTreeView(ContextMixin, TreeView): # type: ignore real_model = self.proxy_man.get_control() from dataclasses import fields from dzgui.model.proxy_model import ServerRow + key = fields(ServerRow)[col_index].name value = getattr(real_model[row_index], key) diff --git a/dzgui/views/trees/tree_simple.py b/dzgui/views/trees/tree_simple.py index be96668..8bd9f48 100644 --- a/dzgui/views/trees/tree_simple.py +++ b/dzgui/views/trees/tree_simple.py @@ -1,13 +1,13 @@ +import gi + from typing import TYPE_CHECKING, Union +gi.require_version("Gtk", "3.0") +from gi.repository import Gtk + if TYPE_CHECKING: from dzgui.model.model_factory import FastInsertListStore -import gi - -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk # noqa - class SimpleTree(Gtk.ScrolledWindow): """Simple scrollable 1-column tree""" diff --git a/tests/test_colorscheme.py b/tests/test_colorscheme.py index a8818dc..3462231 100644 --- a/tests/test_colorscheme.py +++ b/tests/test_colorscheme.py @@ -1,13 +1,12 @@ +import gi import pytest import subprocess from dzgui.const.constants import GIO_SETTINGS_KEY from dzgui.views.mixins.colorscheme import ColorAwareApp -import gi - gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, Gio, GLib # noqa +from gi.repository import Gtk, GLib class DummyWidget(ColorAwareApp, Gtk.Button):