optimize imports
This commit is contained in:
parent
717575256c
commit
03ab14fa64
@ -2,10 +2,8 @@
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
import importlib
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import signal
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import pathlib
|
import pathlib
|
||||||
import traceback # noqa
|
import traceback # noqa
|
||||||
@ -14,7 +12,9 @@ import gi
|
|||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, Gdk, GLib, Pango
|
from gi.repository import Gtk, Gdk, GLib, Pango
|
||||||
|
from importlib import import_module
|
||||||
from jinja2 import Environment
|
from jinja2 import Environment
|
||||||
|
from signal import SIGTERM
|
||||||
|
|
||||||
from ks_includes import functions
|
from ks_includes import functions
|
||||||
from ks_includes.KlippyWebsocket import KlippyWebsocket
|
from ks_includes.KlippyWebsocket import KlippyWebsocket
|
||||||
@ -241,7 +241,7 @@ class KlipperScreen(Gtk.Window):
|
|||||||
logging.error(f"Panel {panel} does not exist")
|
logging.error(f"Panel {panel} does not exist")
|
||||||
raise FileNotFoundError(os.strerror(2), "\n" + panel_path)
|
raise FileNotFoundError(os.strerror(2), "\n" + panel_path)
|
||||||
|
|
||||||
module = importlib.import_module(f"panels.{panel}")
|
module = import_module(f"panels.{panel}")
|
||||||
if not hasattr(module, "create_panel"):
|
if not hasattr(module, "create_panel"):
|
||||||
raise ImportError(f"Cannot locate create_panel function for {panel}")
|
raise ImportError(f"Cannot locate create_panel function for {panel}")
|
||||||
self.load_panel[panel] = getattr(module, "create_panel")
|
self.load_panel[panel] = getattr(module, "create_panel")
|
||||||
@ -953,7 +953,7 @@ class KlipperScreen(Gtk.Window):
|
|||||||
return
|
return
|
||||||
|
|
||||||
if 'process' in self.keyboard:
|
if 'process' in self.keyboard:
|
||||||
os.kill(self.keyboard['process'].pid, signal.SIGTERM)
|
os.kill(self.keyboard['process'].pid, SIGTERM)
|
||||||
self.base_panel.get_content().remove(self.keyboard['box'])
|
self.base_panel.get_content().remove(self.keyboard['box'])
|
||||||
self.keyboard = None
|
self.keyboard = None
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user