From d5e54c04882d6ec06075cecba5194aa0cae5c8e6 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Thu, 18 Dec 2025 20:52:04 +0900
Subject: [PATCH] chore: clear linting errors

---
 dzgui/api/mods.py                       |  1 -
 dzgui/config/freedesktop.py             |  1 -
 dzgui/init/migrate.py                   |  2 +-
 dzgui/main.py                           |  4 +---
 dzgui/util/dist.py                      |  9 +++++----
 dzgui/views/base.py                     | 10 +++++-----
 dzgui/views/components/buttonbox.py     | 13 ++++---------
 dzgui/views/components/connect_panel.py |  6 +++---
 dzgui/views/components/eventbox.py      |  8 ++++----
 dzgui/views/components/icon.py          |  4 ++--
 dzgui/views/components/label.py         |  4 ++--
 dzgui/views/components/mod_panel.py     | 14 +++++---------
 dzgui/views/mixins/context_mixin.py     |  2 +-
 13 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/dzgui/api/mods.py b/dzgui/api/mods.py
index a23bc20..33f902e 100644
--- a/dzgui/api/mods.py
+++ b/dzgui/api/mods.py
@@ -1,7 +1,6 @@
 import dayzquery
 import hashlib
 import logging
-import re
 import shlex
 
 from dataclasses import dataclass
diff --git a/dzgui/config/freedesktop.py b/dzgui/config/freedesktop.py
index 5ddb20a..a9aa87c 100644
--- a/dzgui/config/freedesktop.py
+++ b/dzgui/config/freedesktop.py
@@ -2,7 +2,6 @@ import shutil
 import textwrap
 from pathlib import Path
 
-
 def write_desktop_file(share_path: Path) -> None:
     template = f"""\
     [Desktop Entry]
diff --git a/dzgui/init/migrate.py b/dzgui/init/migrate.py
index 70ebbd6..e7594b9 100644
--- a/dzgui/init/migrate.py
+++ b/dzgui/init/migrate.py
@@ -32,7 +32,7 @@ def migrate_cols_file(res: Path) -> None:
             return
         cols["View"] = cols.pop("Perspective")
         cols["Max"] = cols.pop("Maximum")
-    write_json(j, res)
+        write_json(j, res)
 
 
 def copy_state_files(state_path: Path) -> None:
diff --git a/dzgui/main.py b/dzgui/main.py
index 57a09dd..4274de4 100644
--- a/dzgui/main.py
+++ b/dzgui/main.py
@@ -3,8 +3,6 @@ import logging
 import os
 import sys
 
-from packaging.version import Version
-
 from dzgui.api.mods import remove_stale_signatures
 
 from dzgui.config.ipdb import get_ipdb
@@ -16,7 +14,7 @@ from dzgui.const.update import ALLOW_UPDATES
 
 from dzgui.init.coords import get_local_coords
 from dzgui.init.dayz import is_dayz_installed
-from dzgui.init.flock import lock_acquire, lock_release
+from dzgui.init.flock import lock_acquire
 from dzgui.init.migrate import (
     has_new_config,
     migrate_cols_file,
diff --git a/dzgui/util/dist.py b/dzgui/util/dist.py
index 8c6d41b..0d6f0d8 100644
--- a/dzgui/util/dist.py
+++ b/dzgui/util/dist.py
@@ -1,15 +1,16 @@
 import multiprocessing
 from math import radians, cos, sin, asin, sqrt
-from typing import Self, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
-import gi
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 import dzgui.util.ip as ip
 from dzgui.util.ip import GeolocationError
 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 dzgui.util.ip import Coords
 
diff --git a/dzgui/views/base.py b/dzgui/views/base.py
index 5983444..a629597 100644
--- a/dzgui/views/base.py
+++ b/dzgui/views/base.py
@@ -19,10 +19,6 @@ from enum import Enum
 from pathlib import Path
 from typing import Literal, Any
 
-import gi
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa
-
 # TODO: most likely very little of this will be retained
 from dzgui.const.enum import (
     Preferences,
@@ -35,7 +31,6 @@ from dzgui.const.enum import (
 from dzgui.const.constants import NO_EXPAND, NO_FILL, EXPAND, FILL
 from dzgui.const.constants import APP_NAME, APP_NAME_LOWER, WINDOW_DEFAULT_X, WINDOW_DEFAULT_Y
 from dzgui.controllers.mc import Controller
-
 from dzgui.util import css, dist, localize, strings, ip, deck, open_links
 from dzgui.util.format import pluralize
 
@@ -62,6 +57,11 @@ from dzgui.views.dialogs.generic import GenericDialog
 # TODO: not going to be in base anymore
 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 E402
+
+
 logger = logging.getLogger(__name__)
 # https://bugzilla.gnome.org/show_bug.cgi?id=708676
 warnings.filterwarnings("ignore", ".*g_value_get_int", Warning)
diff --git a/dzgui/views/components/buttonbox.py b/dzgui/views/components/buttonbox.py
index 131a6ac..6cf6976 100644
--- a/dzgui/views/components/buttonbox.py
+++ b/dzgui/views/components/buttonbox.py
@@ -1,16 +1,11 @@
 import logging
-import functools
-
-import gi  # noqa E402
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
 
 from dzgui.const.enum import ButtonType
-from dzgui.const.enum import NotebookPage
-from dzgui.const.enum import RowType
-from dzgui.const.constants import NO_EXPAND, NO_FILL, EXPAND, FILL
+from dzgui.const.constants import NO_EXPAND, NO_FILL
 
-from typing import Callable
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gdk  # noqa E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/dzgui/views/components/connect_panel.py b/dzgui/views/components/connect_panel.py
index f45fea3..f600828 100644
--- a/dzgui/views/components/connect_panel.py
+++ b/dzgui/views/components/connect_panel.py
@@ -1,9 +1,9 @@
-import gi  # noqa E402
+import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk # noqa E402
 
 class ConnectPanel(Gtk.Grid):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
 
         self.label = Gtk.Label(label="Connect by IP/ID")
diff --git a/dzgui/views/components/eventbox.py b/dzgui/views/components/eventbox.py
index 57c8a25..aa607de 100644
--- a/dzgui/views/components/eventbox.py
+++ b/dzgui/views/components/eventbox.py
@@ -1,9 +1,9 @@
-import gi  # noqa E402
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
-
 from dzgui.const.constants import HELP_BUBBLE
 
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gdk  # noqa E402
+
 class InfoEventBox(Gtk.EventBox):
     def __init__(self, text: str, parent: Gtk.Widget):
         super().__init__(margin_start=10)
diff --git a/dzgui/views/components/icon.py b/dzgui/views/components/icon.py
index 7213a79..0ade27e 100644
--- a/dzgui/views/components/icon.py
+++ b/dzgui/views/components/icon.py
@@ -1,9 +1,9 @@
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 class Icon(Gtk.Image):
-    def __init__(self, name: str, l_margin=0):
+    def __init__(self, name: str, l_margin=0) -> None:
         super().__init__(icon_name=name,
             icon_size=Gtk.IconSize.BUTTON,
             margin_start=l_margin
diff --git a/dzgui/views/components/label.py b/dzgui/views/components/label.py
index 71ecbbf..4100a01 100644
--- a/dzgui/views/components/label.py
+++ b/dzgui/views/components/label.py
@@ -1,6 +1,6 @@
-import gi  # noqa E402
+import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
+from gi.repository import Gtk  # noqa E402
 
 class LeftLabel(Gtk.Label):
     def __init__(self, text: str, tooltip: str = ""):
diff --git a/dzgui/views/components/mod_panel.py b/dzgui/views/components/mod_panel.py
index 5a706e5..599daba 100644
--- a/dzgui/views/components/mod_panel.py
+++ b/dzgui/views/components/mod_panel.py
@@ -1,16 +1,12 @@
-import threading
+from typing import TYPE_CHECKING
 
-import gi  # noqa E402
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
-
-from dzgui.const.enum import ModButton, Popup
+from dzgui.const.enum import ModButton
 from dzgui.const.constants import NO_EXPAND, FILL
 from dzgui.util import strings
 
-from dzgui.views.dialogs.generic import GenericDialog
-
-from typing import TYPE_CHECKING
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk # noqa E402
 
 if TYPE_CHECKING:
     from dzgui.controllers.mc import Controller
diff --git a/dzgui/views/mixins/context_mixin.py b/dzgui/views/mixins/context_mixin.py
index ecb3826..7b37313 100644
--- a/dzgui/views/mixins/context_mixin.py
+++ b/dzgui/views/mixins/context_mixin.py
@@ -1,6 +1,6 @@
 import logging
 from dzgui.views.trees.tree_base import TreeView
-from dzgui.const.enum import Popup, ContextMenu
+from dzgui.const.enum import ContextMenu
 
 import gi
 gi.require_version("Gtk", "3.0")