From f3c0daef1b7535c73d73f229aaf0efe09b3fb265 Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Tue, 9 Jan 2024 01:06:23 -0300
Subject: [PATCH] minor refactors

---
 ks_includes/widgets/prompts.py |  2 +-
 panels/print.py                | 13 ++++++++-----
 screen.py                      | 14 ++++++++------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ks_includes/widgets/prompts.py b/ks_includes/widgets/prompts.py
index 11f4ac2d..c0b799a4 100644
--- a/ks_includes/widgets/prompts.py
+++ b/ks_includes/widgets/prompts.py
@@ -17,7 +17,7 @@ class Prompt:
 
     def _key_press_event(self, widget, event):
         keyval_name = Gdk.keyval_name(event.keyval)
-        if keyval_name == "Escape" or keyval_name == "BackSpace":
+        if keyval_name in ["Escape", "BackSpace"]:
             self.close()
 
     def decode(self, data):
diff --git a/panels/print.py b/panels/print.py
index 9ef64737..2f1364af 100644
--- a/panels/print.py
+++ b/panels/print.py
@@ -73,11 +73,14 @@ class Panel(ScreenPanel):
 
     def add_directory(self, directory):
         parent_dir = os.path.dirname(directory)
-        modified = 0
-        for x in self._files.directories:
-            if x['dirname'] == os.path.split(directory)[-1]:
-                modified = x['modified']
-                break
+        modified = next(
+            (
+                x['modified']
+                for x in self._files.directories
+                if x['dirname'] == os.path.split(directory)[-1]
+            ),
+            0,
+        )
         if directory not in self.filelist:
             self.filelist[directory] = {'directories': [], 'files': [], 'modified': modified}
             self.filelist[parent_dir]['directories'].append(directory)
diff --git a/screen.py b/screen.py
index f0e97ffa..a66c96a5 100755
--- a/screen.py
+++ b/screen.py
@@ -215,13 +215,15 @@ class KlipperScreen(Gtk.Window):
         self.connecting = True
         self.initialized = False
 
-        ind = 0
         logging.info(f"Connecting to printer: {name}")
-        for printer in self.printers:
-            if name == list(printer)[0]:
-                ind = self.printers.index(printer)
-                break
-
+        ind = next(
+            (
+                self.printers.index(printer)
+                for printer in self.printers
+                if name == list(printer)[0]
+            ),
+            0,
+        )
         self.printer = self.printers[ind]["data"]
         self.apiclient = KlippyRest(
             self.printers[ind][name]["moonraker_host"],