From 9ccd84dedf85e4bd303794d50f27ac3c55d3a736 Mon Sep 17 00:00:00 2001 From: heliguy4599 Date: Sat, 12 Oct 2024 23:48:07 -0400 Subject: [PATCH] Clean up unused imports --- src/gtk/app_row.py | 2 +- src/gtk/loading_status.py | 2 +- src/gtk/sidebar_button.py | 4 ++-- src/host_info.py | 2 +- src/install_page/file_install_dialog.py | 5 +---- src/install_page/install_page.py | 2 +- src/install_page/pending_page.py | 3 +-- src/install_page/result_row.py | 6 ++---- src/install_page/results_page.py | 1 - src/main_window/window.py | 10 ++-------- src/package_install_worker.py | 1 - src/packages_page/filters_page.py | 2 +- src/packages_page/uninstall_dialog.py | 2 +- src/properties_page/properties_page.py | 2 +- src/remotes_page/add_remote_dialog.py | 2 +- src/remotes_page/remote_row.py | 2 +- src/snapshot_page/new_snapshot_dialog.py | 4 ++-- src/snapshot_page/snapshots_list_page.py | 2 +- src/user_data_page/data_box.py | 2 +- src/user_data_page/data_subpage.py | 4 +--- src/user_data_page/user_data_page.py | 2 +- 21 files changed, 23 insertions(+), 39 deletions(-) diff --git a/src/gtk/app_row.py b/src/gtk/app_row.py index e62ee06..85743db 100644 --- a/src/gtk/app_row.py +++ b/src/gtk/app_row.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Pango +from gi.repository import Adw, Gtk, GLib from .host_info import HostInfo @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/app_row.ui") diff --git a/src/gtk/loading_status.py b/src/gtk/loading_status.py index 3a78e30..0cbd978 100644 --- a/src/gtk/loading_status.py +++ b/src/gtk/loading_status.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Gtk, GLib from .host_info import HostInfo @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/loading_status.ui") diff --git a/src/gtk/sidebar_button.py b/src/gtk/sidebar_button.py index 044a356..7e12753 100644 --- a/src/gtk/sidebar_button.py +++ b/src/gtk/sidebar_button.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, Gdk, GLib +from gi.repository import Gtk from .host_info import HostInfo class SidebarButton(Gtk.Button): @@ -16,4 +16,4 @@ class SidebarButton(Gtk.Button): # Apply self.set_icon_name("dock-left-symbolic") - self.set_tooltip_text(_("Show Sidebar")) \ No newline at end of file + self.set_tooltip_text(_("Show Sidebar")) diff --git a/src/host_info.py b/src/host_info.py index 2f624ef..e5c11a4 100644 --- a/src/host_info.py +++ b/src/host_info.py @@ -1,4 +1,4 @@ -from gi.repository import Gio, Gtk, GLib, Adw, Gdk +from gi.repository import Gio, Gtk, GLib, Gdk from .error_toast import ErrorToast import subprocess, os, pathlib diff --git a/src/install_page/file_install_dialog.py b/src/install_page/file_install_dialog.py index c18d257..8b367e3 100644 --- a/src/install_page/file_install_dialog.py +++ b/src/install_page/file_install_dialog.py @@ -1,7 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio -from .host_info import HostInfo -from .error_toast import ErrorToast -from .installation_chooser import InstallationChooser +from gi.repository import Adw, Gtk @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/file_install_dialog.ui") class FileInstallDialog(Adw.Dialog): diff --git a/src/install_page/install_page.py b/src/install_page/install_page.py index 5e3bb5a..bb060ac 100644 --- a/src/install_page/install_page.py +++ b/src/install_page/install_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk, GLib from .host_info import HostInfo from .select_page import SelectPage from .pending_page import PendingPage diff --git a/src/install_page/pending_page.py b/src/install_page/pending_page.py index 981aba4..3e3710e 100644 --- a/src/install_page/pending_page.py +++ b/src/install_page/pending_page.py @@ -1,6 +1,5 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk from .host_info import HostInfo -from .error_toast import ErrorToast from .result_row import ResultRow class AddedGroup(Adw.PreferencesGroup): diff --git a/src/install_page/result_row.py b/src/install_page/result_row.py index 78a0cca..df7c4c0 100644 --- a/src/install_page/result_row.py +++ b/src/install_page/result_row.py @@ -1,8 +1,6 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Gdk -from .host_info import HostInfo -from .error_toast import ErrorToast +from gi.repository import Adw, Gtk, GLib from enum import Enum -import os, subprocess +import os @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/result_row.ui") class ResultRow(Adw.ActionRow): diff --git a/src/install_page/results_page.py b/src/install_page/results_page.py index aa246a8..b2effdb 100644 --- a/src/install_page/results_page.py +++ b/src/install_page/results_page.py @@ -1,6 +1,5 @@ from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo -from .error_toast import ErrorToast from .result_row import ResultRow from .loading_status import LoadingStatus import subprocess diff --git a/src/main_window/window.py b/src/main_window/window.py index f211d56..febcfef 100644 --- a/src/main_window/window.py +++ b/src/main_window/window.py @@ -16,21 +16,15 @@ # # SPDX-License-Identifier: GPL-3.0-only -import os -import pathlib -import subprocess -import re -import time - -from gi.repository import Adw, Gdk, Gio, GLib, Gtk, GObject +from gi.repository import Adw, Gdk, Gio, GLib, Gtk from .host_info import HostInfo from .packages_page import PackagesPage from .remotes_page import RemotesPage from .user_data_page import UserDataPage from .snapshot_page import SnapshotPage from .install_page import InstallPage -from .const import Config from .error_toast import ErrorToast +from .const import Config @Gtk.Template(resource_path="/io/github/flattool/Warehouse/main_window/window.ui") class WarehouseWindow(Adw.ApplicationWindow): diff --git a/src/package_install_worker.py b/src/package_install_worker.py index 6ff0542..21e8d1f 100644 --- a/src/package_install_worker.py +++ b/src/package_install_worker.py @@ -1,4 +1,3 @@ -from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo import subprocess, re diff --git a/src/packages_page/filters_page.py b/src/packages_page/filters_page.py index 00c6210..9d69b8f 100644 --- a/src/packages_page/filters_page.py +++ b/src/packages_page/filters_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk, Gio from .host_info import HostInfo class FilterRow(Adw.ActionRow): diff --git a/src/packages_page/uninstall_dialog.py b/src/packages_page/uninstall_dialog.py index 2c1969d..535d35f 100644 --- a/src/packages_page/uninstall_dialog.py +++ b/src/packages_page/uninstall_dialog.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Pango +from gi.repository import Adw, Gtk, GLib @Gtk.Template(resource_path="/io/github/flattool/Warehouse/packages_page/uninstall_dialog.ui") class UninstallDialog(Adw.AlertDialog): diff --git a/src/properties_page/properties_page.py b/src/properties_page/properties_page.py index b84eba5..ee8d076 100644 --- a/src/properties_page/properties_page.py +++ b/src/properties_page/properties_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk,GLib, Gio +from gi.repository import Adw, Gtk, GLib, Gio from .error_toast import ErrorToast from .host_info import HostInfo from .change_version_page import ChangeVersionPage diff --git a/src/remotes_page/add_remote_dialog.py b/src/remotes_page/add_remote_dialog.py index 654e915..b716739 100644 --- a/src/remotes_page/add_remote_dialog.py +++ b/src/remotes_page/add_remote_dialog.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .loading_status import LoadingStatus diff --git a/src/remotes_page/remote_row.py b/src/remotes_page/remote_row.py index a9dd856..0a0b2dd 100644 --- a/src/remotes_page/remote_row.py +++ b/src/remotes_page/remote_row.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Pango +from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast import subprocess diff --git a/src/snapshot_page/new_snapshot_dialog.py b/src/snapshot_page/new_snapshot_dialog.py index f7d25c8..0be4539 100644 --- a/src/snapshot_page/new_snapshot_dialog.py +++ b/src/snapshot_page/new_snapshot_dialog.py @@ -1,10 +1,10 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk, GLib from .host_info import HostInfo from .error_toast import ErrorToast from .loading_status import LoadingStatus from .app_row import AppRow from .tar_worker import TarWorker -import subprocess, os, time +import os, time @Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshot_page/new_snapshot_dialog.ui") class NewSnapshotDialog(Adw.Dialog): diff --git a/src/snapshot_page/snapshots_list_page.py b/src/snapshot_page/snapshots_list_page.py index d6d306a..77f9096 100644 --- a/src/snapshot_page/snapshots_list_page.py +++ b/src/snapshot_page/snapshots_list_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio +from gi.repository import Adw, Gtk, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .snapshot_box import SnapshotBox diff --git a/src/user_data_page/data_box.py b/src/user_data_page/data_box.py index 7d135c1..a87ccd2 100644 --- a/src/user_data_page/data_box.py +++ b/src/user_data_page/data_box.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Pango +from gi.repository import Adw, Gtk, GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .attempt_install_dialog import AttemptInstallDialog diff --git a/src/user_data_page/data_subpage.py b/src/user_data_page/data_subpage.py index a3c3c36..1a42364 100644 --- a/src/user_data_page/data_subpage.py +++ b/src/user_data_page/data_subpage.py @@ -1,10 +1,8 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Pango +from gi.repository import Gtk, GLib, Gio from .host_info import HostInfo from .error_toast import ErrorToast from .data_box import DataBox -from .host_info import HostInfo from .loading_status import LoadingStatus -import subprocess @Gtk.Template(resource_path="/io/github/flattool/Warehouse/user_data_page/data_subpage.ui") class DataSubpage(Gtk.Stack): diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index a6861ad..a97361e 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -1,4 +1,4 @@ -from gi.repository import Adw, Gtk, GLib, Gio, Gdk +from gi.repository import Adw, Gtk, Gio, Gdk from .error_toast import ErrorToast from .data_box import DataBox from .data_subpage import DataSubpage