refactor: optimize imports

bankm1 · Nov 26, 2024 · a92be75 · a92be75
1 parent 48fcfbf
commit a92be75
Show file tree

Hide file tree

Showing 45 changed files with 57 additions and 29 deletions.
diff --git a/ks_includes/KlippyGtk.py b/ks_includes/KlippyGtk.py
@@ -2,6 +2,7 @@
 import logging
 import os
 import pathlib
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/KlippyRest.py b/ks_includes/KlippyRest.py
@@ -1,5 +1,6 @@
 import logging
 import re
+
 import requests
 
 

diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
-import threading
 import json
 import logging
+import threading
 
 import gi
 import websocket

diff --git a/ks_includes/config.py b/ks_includes/config.py
@@ -1,13 +1,12 @@
 import configparser
+import copy
 import gettext
-import os
-import logging
 import json
-import re
-import copy
-import pathlib
 import locale
-
+import logging
+import os
+import pathlib
+import re
 from io import StringIO
 
 SCREEN_BLANKING_OPTIONS = [

diff --git a/ks_includes/files.py b/ks_includes/files.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/functions.py b/ks_includes/functions.py
@@ -1,17 +1,14 @@
+import ctypes
 import logging
 import logging.handlers
 import os
-import re
+import struct
 import subprocess
 import sys
 import threading
-import time
 import traceback
 from queue import SimpleQueue as Queue
 
-import ctypes
-import struct
-
 dpms_loaded = False
 try:
     ctypes.cdll.LoadLibrary('libXext.so.6')

diff --git a/ks_includes/printer.py b/ks_includes/printer.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py
@@ -1,5 +1,6 @@
-import logging
 import datetime
+import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/sdbus_nm.py b/ks_includes/sdbus_nm.py
@@ -1,8 +1,9 @@
 # This is the backend of the UI panel that communicates to sdbus-networkmanager
 # TODO device selection/swtichability
 # Alfredo Monclus (alfrix) 2024
-import subprocess
 import logging
+import subprocess
+from uuid import uuid4
 
 import sdbus
 from sdbus_block.networkmanager import (
@@ -18,8 +19,6 @@
     enums,
     exceptions,
 )
-from gi.repository import GLib
-from uuid import uuid4
 
 NONE = 0  # The access point has no special security requirements.
 PAIR_WEP40 = 1  # 40/64-bit WEP is supported for pairwise/unicast encryption.

diff --git a/ks_includes/widgets/bedmap.py b/ks_includes/widgets/bedmap.py
@@ -1,4 +1,3 @@
-import logging
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/widgets/heatergraph.py b/ks_includes/widgets/heatergraph.py
@@ -1,7 +1,6 @@
 import datetime
 import logging
 import math
-from array import array
 
 import gi
 

diff --git a/ks_includes/widgets/keyboard.py b/ks_includes/widgets/keyboard.py
@@ -1,4 +1,3 @@
-import logging
 import os
 
 import gi

diff --git a/ks_includes/widgets/lockscreen.py b/ks_includes/widgets/lockscreen.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version('Gtk', '3.0')

diff --git a/ks_includes/widgets/prompts.py b/ks_includes/widgets/prompts.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/ks_includes/widgets/screensaver.py b/ks_includes/widgets/screensaver.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/base_panel.py b/panels/base_panel.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/bed_level.py b/panels/bed_level.py
@@ -1,6 +1,7 @@
 import logging
-import re
 import math
+import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py
@@ -1,5 +1,6 @@
 import contextlib
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/camera.py b/panels/camera.py
@@ -1,5 +1,6 @@
-import mpv
 import logging
+import mpv
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/console.py b/panels/console.py
@@ -1,5 +1,6 @@
-import time
 import re
+import time
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/exclude.py b/panels/exclude.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/extrude.py b/panels/extrude.py
@@ -1,5 +1,6 @@
 import logging
 import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/fan.py b/panels/fan.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/fine_tune.py b/panels/fine_tune.py
@@ -1,5 +1,6 @@
 import logging
 import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py
@@ -1,5 +1,6 @@
 import logging
 import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/gcodes.py b/panels/gcodes.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/input_shaper.py b/panels/input_shaper.py
@@ -1,4 +1,5 @@
 import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/job_status.py b/panels/job_status.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/led.py b/panels/led.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/limits.py b/panels/limits.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/main_menu.py b/panels/main_menu.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/menu.py b/panels/menu.py
@@ -1,5 +1,6 @@
-import logging
 import json
+import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/move.py b/panels/move.py
@@ -1,5 +1,6 @@
-import re
 import logging
+import re
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/network.py b/panels/network.py
@@ -1,6 +1,6 @@
-import subprocess
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/pins.py b/panels/pins.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/power.py b/panels/power.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/pressure_advance.py b/panels/pressure_advance.py
@@ -1,8 +1,9 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Pango
+from gi.repository import Gtk
 from ks_includes.screen_panel import ScreenPanel
 
 # TODO multi-extruder support

diff --git a/panels/printer_select.py b/panels/printer_select.py
@@ -1,8 +1,9 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib
+from gi.repository import Gtk
 from ks_includes.screen_panel import ScreenPanel
 from ks_includes.widgets.autogrid import AutoGrid
 from ks_includes.KlippyGtk import find_widget

diff --git a/panels/retraction.py b/panels/retraction.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/shutdown.py b/panels/shutdown.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/splash_screen.py b/panels/splash_screen.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/spoolman.py b/panels/spoolman.py
@@ -1,6 +1,7 @@
+import logging
 import os.path
 import pathlib
-import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/system.py b/panels/system.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/temperature.py b/panels/temperature.py
@@ -1,4 +1,5 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")

diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py
@@ -1,10 +1,10 @@
 import logging
+
 import gi
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Pango, GLib
 from ks_includes.screen_panel import ScreenPanel
-from ks_includes.KlippyGtk import find_widget
 from datetime import datetime