Optimize imports

ks_includes/KlippyGtk.py

@@ -5,7 +5,7 @@ import os
 import pathlib
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GdkPixbuf, Gio, GLib, Pango
+from gi.repository import Gdk, GdkPixbuf, Gio, Gtk, Pango
 
 klipperscreendir = pathlib.Path(__file__).parent.resolve().parent
 

ks_includes/KlippyWebsocket.py

@@ -1,17 +1,14 @@
 #!/usr/bin/python
 
 import gi
-import time
 import threading
 
 import json
-import requests
 import websocket
-import asyncio
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import GLib, Gdk
 from ks_includes.KlippyGcodes import KlippyGcodes
 
 api_key = ""

ks_includes/files.py

@@ -1,11 +1,9 @@
 import logging
-import json
 import os
-import base64
 
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import GLib
 
 class KlippyFiles():
     thumbnail_dir = "/tmp/.KS-thumbnails"

ks_includes/printer.py

@@ -3,7 +3,6 @@ import logging
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gdk, GLib
-from ks_includes.KlippyGcodes import KlippyGcodes
 
 
 class Printer:

ks_includes/screen_panel.py

@@ -1,11 +1,8 @@
 import gi
-import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
-from jinja2 import Environment, Template
 
-from ks_includes.KlippyGtk import KlippyGtk
 from ks_includes.KlippyGcodes import KlippyGcodes
 
 class ScreenPanel:

ks_includes/widgets/graph.py

@@ -4,7 +4,7 @@ import logging
 import math
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk
 
 
 class HeaterGraph(Gtk.DrawingArea):

ks_includes/widgets/keypad.py

@@ -1,10 +1,7 @@
-import datetime
 import gi
-import logging
-import math
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gtk
 
 
 class Keypad(Gtk.Box):

ks_includes/wifi.py

@@ -1,22 +1,16 @@
 import os
-import signal
-import json
 import logging
 import re
 import socket
-import subprocess
 import threading
-import time
 
-from contextlib import suppress
 from threading import Thread
 
-from subprocess import PIPE, Popen, STDOUT
+from queue import Queue
-from queue import Queue, Empty
 
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import GLib, Gdk
 
 RESCAN_INTERVAL = 180
 KS_SOCKET_FILE = "/tmp/.KS_wpa_supplicant"

panels/base_panel.py

@@ -4,11 +4,9 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import GLib, Gtk, Pango
-from jinja2 import Environment, Template
+from jinja2 import Environment
 
-from ks_includes.KlippyGtk import KlippyGtk
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 class BasePanel(ScreenPanel):

panels/bed_level.py

@@ -3,7 +3,7 @@ import logging
 import re
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel

panels/bed_mesh.py

@@ -3,7 +3,7 @@ import logging
 import numpy as np
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
 import matplotlib.pyplot as plt
 from matplotlib import cm

panels/console.py

@@ -3,10 +3,9 @@ import logging
 import time
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from datetime import datetime
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/example.py

@@ -1,10 +1,8 @@
 import gi
-import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/extrude.py

@@ -2,7 +2,7 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel

panels/fine_tune.py

@@ -3,7 +3,7 @@ import logging
 import re
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel

panels/gcode_macros.py

@@ -2,9 +2,8 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/job_status.py

@@ -5,7 +5,7 @@ import math
 import os
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import GLib, Gtk, Pango
 
 from ks_includes.screen_panel import ScreenPanel
 

panels/limits.py

@@ -2,9 +2,8 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/main_menu.py

@@ -1,13 +1,10 @@
-import datetime
 import gi
-import math
 import logging
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
 from panels.menu import MenuPanel
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.widgets.graph import HeaterGraph
 from ks_includes.widgets.keypad import Keypad
 

panels/menu.py

@@ -1,9 +1,8 @@
-import gettext
 import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 from jinja2 import Environment, Template
 
 from ks_includes.screen_panel import ScreenPanel

panels/move.py

@@ -2,7 +2,7 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel

panels/network.py

@@ -1,9 +1,7 @@
 import gi
-import json
 import logging
 import netifaces
 import os
-import re
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango

panels/power.py

@@ -2,9 +2,8 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/print.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import gi
-import json
 import logging
 import os
 
@@ -8,7 +7,6 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
 from datetime import datetime
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/printer_select.py

@@ -2,9 +2,7 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 logger = logging.getLogger("KlipperScreen.PrinterSelect")

panels/settings.py

@@ -2,9 +2,8 @@ import gi
 import logging
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/splash_screen.py

@@ -1,9 +1,8 @@
 import gi
 import logging
-import os
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 
 from ks_includes.screen_panel import ScreenPanel
 

panels/system.py

@@ -3,10 +3,9 @@ import logging
 import os
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib, Pango
+from gi.repository import Gdk, Gtk, Pango
 from datetime import datetime
 
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
 def create_panel(*args):

panels/temperature.py

@@ -1,13 +1,10 @@
-import datetime
 import gi
-import math
 import logging
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
 
 from ks_includes.screen_panel import ScreenPanel
-from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.widgets.graph import HeaterGraph
 from ks_includes.widgets.keypad import Keypad
 

panels/zcalibrate.py

@@ -1,7 +1,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk, GLib
+from gi.repository import Gtk
 
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel

screen.py

@@ -2,27 +2,20 @@
 
 import argparse
 import gi
-import gettext
-import time
-import threading
 
 import json
 import netifaces
-import requests
-import websocket
 import importlib
 import logging
 import os
 import re
 import signal
 import subprocess
-import sys
-import traceback
 import pathlib
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib, Pango
-from jinja2 import Environment, Template
+from jinja2 import Environment
 
 from ks_includes import functions
 from ks_includes.KlippyWebsocket import KlippyWebsocket
@@ -36,7 +29,7 @@ from ks_includes.config import KlipperScreenConfig
 from panels.base_panel import BasePanel
 
 logging.getLogger('matplotlib').setLevel(logging.WARNING)
-import numpy
+# This is here to avoid performance issues opening bed_mesh
 import matplotlib.pyplot
 
 PRINTER_BASE_STATUS_OBJECTS = [