chore: update pyproject.toml

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

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)
 

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

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

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)
 

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
 

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

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

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:

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:

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

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:

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

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:
     """

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

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  # type: ignore
 
 if TYPE_CHECKING:
     from dzgui.config.userprefs import UserPrefs

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)
 

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

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

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

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

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

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():

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):

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):

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):

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

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

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

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):

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)

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

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):

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

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:

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

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):

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

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)
 

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:

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:

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)
 

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

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

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

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

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:

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)
 

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:

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

pyproject.toml

@@ -78,6 +78,7 @@ line-length = 88
 indent-width = 4
 extend-exclude = ["*lib/a2s"]
 lint.unfixable = ["F401", "I001"]
+lint.ignore = ["E402"]
 
 [tool.ruff.format]
 quote-style = "double"

scripts/unused_imports.py

@@ -1,38 +0,0 @@
-from pathlib import Path
-
-
-def iterate(search_str: str) -> None:
-    # TODO: exclude files from .gitignore
-    print()
-    print(f"Searching for '{search_str}'")
-    print()
-    files = Path(".").rglob("*")
-    ignore = [
-        "scripts/",
-        ".git",
-        "egg",
-        "CHANGELOG",
-        ".mypy",
-        "build/",
-        "test.py",
-        "bugs",
-        "pyproject.toml",
-    ]
-    for file in files:
-        if file.is_dir():
-            continue
-        if any(s in str(file) for s in ignore):
-            continue
-        try:
-            text = file.read_text()
-            if search_str in text:
-                c = text.count(search_str)
-                if 0 < c < 2:
-                    print(file, c)
-        except Exception:
-            continue
-
-
-imports = ["Pango", "GObject", "GLib", "Gdk", "Gtk"]
-for i in imports:
-    iterate(i)

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: