From b8306a9c4d1925b0b40575d3429da6cf27c77578 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sun, 29 Jan 2023 00:06:52 -0600
Subject: [PATCH] Import cleanup

---
 plugins/template/plugin.py  | 7 ++++++-
 src/__builtins__.py         | 5 ++---
 src/__main__.py             | 3 ++-
 src/app.py                  | 1 +
 src/core/controller.py      | 5 ++---
 src/core/controller_data.py | 1 +
 src/core/core_widget.py     | 6 +++---
 src/core/window.py          | 2 --
 src/utils/ipc_server.py     | 2 +-
 src/utils/keybindings.py    | 3 ++-
 src/utils/logger.py         | 4 ++++
 src/utils/settings.py       | 2 +-
 12 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/plugins/template/plugin.py b/plugins/template/plugin.py
index 5535f4d..c52c0ff 100644
--- a/plugins/template/plugin.py
+++ b/plugins/template/plugin.py
@@ -1,5 +1,8 @@
 # Python imports
-import os, threading, subprocess, time
+import os
+import threading
+import subprocess
+import time
 
 # Lib imports
 import gi
@@ -10,6 +13,8 @@ from gi.repository import Gtk
 from plugins.plugin_base import PluginBase
 
 
+
+
 # NOTE: Threads WILL NOT die with parent's destruction.
 def threaded(fn):
     def wrapper(*args, **kwargs):
diff --git a/src/__builtins__.py b/src/__builtins__.py
index 347540b..c73cb6e 100644
--- a/src/__builtins__.py
+++ b/src/__builtins__.py
@@ -1,8 +1,6 @@
-import builtins
-import threading
-
 # Python imports
 import builtins
+import threading
 
 # Lib imports
 
@@ -14,6 +12,7 @@ from utils.settings import Settings
 
 
 
+
 # NOTE: Threads WILL NOT die with parent's destruction.
 def threaded_wrapper(fn):
     def wrapper(*args, **kwargs):
diff --git a/src/__main__.py b/src/__main__.py
index cd4ddb1..abdc793 100644
--- a/src/__main__.py
+++ b/src/__main__.py
@@ -9,7 +9,6 @@ from setproctitle import setproctitle
 import tracemalloc
 tracemalloc.start()
 
-
 # Lib imports
 import gi
 gi.require_version('Gtk', '3.0')
@@ -20,6 +19,8 @@ from __builtins__ import *
 from app import Application
 
 
+
+
 if __name__ == "__main__":
     ''' Set process title, get arguments, and create GTK main thread. '''
 
diff --git a/src/app.py b/src/app.py
index c15a781..6880502 100644
--- a/src/app.py
+++ b/src/app.py
@@ -10,6 +10,7 @@ from core.window import Window
 
 
 
+
 class AppLaunchException(Exception):
     ...
 
diff --git a/src/core/controller.py b/src/core/controller.py
index 55ae327..0f8475f 100644
--- a/src/core/controller.py
+++ b/src/core/controller.py
@@ -1,12 +1,10 @@
 # Python imports
 import subprocess
 
-# Gtk imports
+# Lib imports
 import gi
-
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
-
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -18,6 +16,7 @@ from .core_widget import CoreWidget
 
 
 
+
 class Controller(DummyMixin, ControllerData):
     def __init__(self, args, unknownargs):
         self._setup_styling()
diff --git a/src/core/controller_data.py b/src/core/controller_data.py
index 400bf42..bc2a941 100644
--- a/src/core/controller_data.py
+++ b/src/core/controller_data.py
@@ -8,6 +8,7 @@ from plugins.plugins_controller import PluginsController
 
 
 
+
 class ControllerData:
     ''' ControllerData contains most of the state of the app at ay given time. It also has some support methods. '''
 
diff --git a/src/core/core_widget.py b/src/core/core_widget.py
index ac99adf..ee1da7c 100644
--- a/src/core/core_widget.py
+++ b/src/core/core_widget.py
@@ -1,15 +1,15 @@
 # Python imports
 
-# Gtk imports
+# Lib imports
 import gi
-
 gi.require_version('Gtk', '3.0')
-
 from gi.repository import Gtk
 
 # Application imports
 
 
+
+
 class CoreWidget(Gtk.Box):
     def __init__(self):
         super(CoreWidget, self).__init__()
diff --git a/src/core/window.py b/src/core/window.py
index 2394050..6520da7 100644
--- a/src/core/window.py
+++ b/src/core/window.py
@@ -5,10 +5,8 @@ import signal
 # Lib imports
 import gi
 import cairo
-
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
-
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GLib
diff --git a/src/utils/ipc_server.py b/src/utils/ipc_server.py
index 0b883df..8226247 100644
--- a/src/utils/ipc_server.py
+++ b/src/utils/ipc_server.py
@@ -1,7 +1,7 @@
 # Python imports
 import os
 import threading
-import ime
+import time
 from multiprocessing.connection import Client
 from multiprocessing.connection import Listener
 
diff --git a/src/utils/keybindings.py b/src/utils/keybindings.py
index a7bbbf6..790c963 100644
--- a/src/utils/keybindings.py
+++ b/src/utils/keybindings.py
@@ -1,7 +1,7 @@
 # Python imports
 import re
 
-# Gtk imports
+# Lib imports
 import gi
 gi.require_version('Gdk', '3.0')
 from gi.repository import Gdk
@@ -10,6 +10,7 @@ from gi.repository import Gdk
 
 
 
+
 def err(log = ""):
     """Print an error message"""
     print(log)
diff --git a/src/utils/logger.py b/src/utils/logger.py
index 436a511..6ca2add 100644
--- a/src/utils/logger.py
+++ b/src/utils/logger.py
@@ -2,9 +2,13 @@
 import os
 import logging
 
+# Lib imports
+
 # Application imports
 
 
+
+
 class Logger:
     """
         Create a new logging object and return it.
diff --git a/src/utils/settings.py b/src/utils/settings.py
index 560f2e3..54650d7 100644
--- a/src/utils/settings.py
+++ b/src/utils/settings.py
@@ -3,7 +3,7 @@ import os
 import json
 import inspect
 
-# Gtk imports
+# Lib imports
 
 # Application imports
 from .logger import Logger