From 5899c8feab2ebe23f6c94d4bc07855ba0176c501 Mon Sep 17 00:00:00 2001 From: alfrix Date: Mon, 14 Mar 2022 18:10:39 -0300 Subject: [PATCH] Optimize imports --- ks_includes/KlippyGtk.py | 2 +- ks_includes/KlippyWebsocket.py | 5 +---- ks_includes/files.py | 4 +--- ks_includes/printer.py | 1 - ks_includes/screen_panel.py | 5 +---- ks_includes/widgets/graph.py | 2 +- ks_includes/widgets/keypad.py | 5 +---- ks_includes/wifi.py | 10 ++-------- panels/base_panel.py | 6 ++---- panels/bed_level.py | 2 +- panels/bed_mesh.py | 2 +- panels/console.py | 3 +-- panels/example.py | 4 +--- panels/extrude.py | 2 +- panels/fine_tune.py | 2 +- panels/gcode_macros.py | 3 +-- panels/job_status.py | 2 +- panels/limits.py | 3 +-- panels/main_menu.py | 3 --- panels/menu.py | 3 +-- panels/move.py | 2 +- panels/network.py | 2 -- panels/power.py | 3 +-- panels/print.py | 2 -- panels/printer_select.py | 2 -- panels/settings.py | 3 +-- panels/splash_screen.py | 3 +-- panels/system.py | 3 +-- panels/temperature.py | 3 --- panels/zcalibrate.py | 2 +- screen.py | 11 ++--------- 31 files changed, 28 insertions(+), 77 deletions(-) diff --git a/ks_includes/KlippyGtk.py b/ks_includes/KlippyGtk.py index d40e7afe..99d1b381 100644 --- a/ks_includes/KlippyGtk.py +++ b/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 diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py index fa151b03..c9735418 100644 --- a/ks_includes/KlippyWebsocket.py +++ b/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 = "" diff --git a/ks_includes/files.py b/ks_includes/files.py index d972eea6..4f2d6908 100644 --- a/ks_includes/files.py +++ b/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" diff --git a/ks_includes/printer.py b/ks_includes/printer.py index baf1cf61..671a7452 100644 --- a/ks_includes/printer.py +++ b/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: diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py index 7b227418..3f56f6e5 100644 --- a/ks_includes/screen_panel.py +++ b/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 jinja2 import Environment, Template +from gi.repository import Gtk -from ks_includes.KlippyGtk import KlippyGtk from ks_includes.KlippyGcodes import KlippyGcodes class ScreenPanel: diff --git a/ks_includes/widgets/graph.py b/ks_includes/widgets/graph.py index 6820e6ae..99f85713 100644 --- a/ks_includes/widgets/graph.py +++ b/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): diff --git a/ks_includes/widgets/keypad.py b/ks_includes/widgets/keypad.py index db0e06e9..4d8afe15 100644 --- a/ks_includes/widgets/keypad.py +++ b/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): diff --git a/ks_includes/wifi.py b/ks_includes/wifi.py index d49dc13a..a111ba55 100644 --- a/ks_includes/wifi.py +++ b/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, Empty +from queue import Queue 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" diff --git a/panels/base_panel.py b/panels/base_panel.py index 10838d37..098d84b5 100644 --- a/panels/base_panel.py +++ b/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 jinja2 import Environment, Template +from gi.repository import GLib, Gtk, Pango +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): diff --git a/panels/bed_level.py b/panels/bed_level.py index 76b0313d..128c21af 100644 --- a/panels/bed_level.py +++ b/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 diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py index 35fa43ff..b17b89c0 100644 --- a/panels/bed_mesh.py +++ b/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 diff --git a/panels/console.py b/panels/console.py index a26b45f6..c34d52ac 100644 --- a/panels/console.py +++ b/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): diff --git a/panels/example.py b/panels/example.py index 85cf26c2..1c27921d 100644 --- a/panels/example.py +++ b/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): diff --git a/panels/extrude.py b/panels/extrude.py index 6eec28ce..ed998fa8 100644 --- a/panels/extrude.py +++ b/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 diff --git a/panels/fine_tune.py b/panels/fine_tune.py index d741019f..210544b6 100644 --- a/panels/fine_tune.py +++ b/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 diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py index c5ea1532..6c3d1be1 100644 --- a/panels/gcode_macros.py +++ b/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): diff --git a/panels/job_status.py b/panels/job_status.py index 1eb34e0b..27f0cce0 100644 --- a/panels/job_status.py +++ b/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 diff --git a/panels/limits.py b/panels/limits.py index 656c4177..70abfe3c 100644 --- a/panels/limits.py +++ b/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): diff --git a/panels/main_menu.py b/panels/main_menu.py index 815035a0..61b4898c 100644 --- a/panels/main_menu.py +++ b/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 diff --git a/panels/menu.py b/panels/menu.py index 04f70bd6..3486554d 100644 --- a/panels/menu.py +++ b/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 diff --git a/panels/move.py b/panels/move.py index 41191c69..b60e9b2e 100644 --- a/panels/move.py +++ b/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 diff --git a/panels/network.py b/panels/network.py index 7a10093f..05e95ce6 100644 --- a/panels/network.py +++ b/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 diff --git a/panels/power.py b/panels/power.py index 3b685358..950a2332 100644 --- a/panels/power.py +++ b/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): diff --git a/panels/print.py b/panels/print.py index cc198be9..077d655c 100644 --- a/panels/print.py +++ b/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): diff --git a/panels/printer_select.py b/panels/printer_select.py index a3889e2d..92c9b5f2 100644 --- a/panels/printer_select.py +++ b/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") diff --git a/panels/settings.py b/panels/settings.py index e225c946..c882b7dc 100644 --- a/panels/settings.py +++ b/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): diff --git a/panels/splash_screen.py b/panels/splash_screen.py index 5dfdd2c1..d0a89896 100644 --- a/panels/splash_screen.py +++ b/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 diff --git a/panels/system.py b/panels/system.py index 4ae51963..f7d5a6b2 100644 --- a/panels/system.py +++ b/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): diff --git a/panels/temperature.py b/panels/temperature.py index 4661cfb8..71958890 100644 --- a/panels/temperature.py +++ b/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 diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py index 31f76d24..0392ec91 100644 --- a/panels/zcalibrate.py +++ b/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 diff --git a/screen.py b/screen.py index 37a737db..60d525ab 100644 --- a/screen.py +++ b/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 = [