ruff: other fixes

Author: deltragon

safeeyes/core.py

@@ -24,7 +24,6 @@
 import time
 
 from safeeyes import utility
-from safeeyes.model import Break
 from safeeyes.model import BreakType
 from safeeyes.model import BreakQueue
 from safeeyes.model import EventHook

safeeyes/model.py

@@ -192,7 +192,6 @@ def is_empty(self, break_type=None):
             return self.__short_queue is None and self.__long_queue is None
 
     def __next_short(self):
-        longs  = self.__long_queue
         shorts = self.__short_queue
         break_obj = shorts[self.__current_short]
         self.context["break_type"] = "short"

safeeyes/plugins/donotdisturb/plugin.py

@@ -20,7 +20,6 @@
 
 import os
 import logging
-import re
 import subprocess
 
 import gi

safeeyes/plugins/healthstats/dependency_checker.py

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import datetime
 from safeeyes import utility
 
 

safeeyes/plugins/healthstats/plugin.py

@@ -168,7 +168,8 @@ def _get_next_reset_time():
         next_reset_time = cron.get_next(datetime.datetime)
         session["next_reset_time"] = next_reset_time.strftime("%Y-%m-%d %H:%M:%S")
         logging.debug("Health stats will be reset at " + session["next_reset_time"])
-    except:
+    except:  # noqa E722
+        # TODO: consider catching Exception here instead of bare except
         logging.error("Error in statistics reset expression: " + statistics_reset_cron)
         next_reset_time = None
 

safeeyes/plugins/screensaver/plugin.py

@@ -20,7 +20,6 @@
 after long breaks.
 """
 
-import gi
 import logging
 import os
 

safeeyes/plugins/smartpause/ext_idle_notify.py

@@ -18,16 +18,12 @@
 
 # This file is heavily inspired by https://github.com/juienpro/easyland/blob/efc26a0b22d7bdbb0f8436183428f7036da4662a/src/easyland/idle.py
 
-import logging
 import threading
 import datetime
 
 from pywayland.client import Display
 from pywayland.protocol.wayland.wl_seat import WlSeat
-from pywayland.protocol.ext_idle_notify_v1 import (
-    ExtIdleNotificationV1,
-    ExtIdleNotifierV1
-)
+from pywayland.protocol.ext_idle_notify_v1 import ExtIdleNotifierV1
 
 
 class ExtIdleNotify:

safeeyes/plugins/smartpause/plugin.py

@@ -21,7 +21,6 @@
 import subprocess
 import threading
 import re
-import os
 
 from safeeyes import utility
 from safeeyes.model import State

safeeyes/plugins/trayicon/plugin.py

@@ -210,7 +210,7 @@ def set_items(self, items):
     @staticmethod
     def getItemsFlat(items, idToItems):
         for item in items:
-            if item.get("hidden", False) == True:
+            if item.get("hidden", False):
                 continue
 
             idToItems[item["id"]] = item
@@ -244,7 +244,7 @@ def itemPropsToDbus(item):
 
     @staticmethod
     def itemToDbus(item, recursion_depth):
-        if item.get("hidden", False) == True:
+        if item.get("hidden", False):
             return None
 
         props = DBusMenuService.itemPropsToDbus(item)
@@ -262,7 +262,7 @@ def itemToDbus(item, recursion_depth):
 
     def findItemsWithParent(self, parent_id, items):
         for item in items:
-            if item.get("hidden", False) == True:
+            if item.get("hidden", False):
                 continue
             if "children" in item:
                 if item["id"] == parent_id:

safeeyes/safeeyes.py

@@ -22,7 +22,6 @@
 
 import atexit
 import logging
-import os
 from threading import Timer
 from importlib import metadata
 
@@ -201,6 +200,8 @@ def show_required_plugin_dialog(self, error: RequiredPluginException):
         self.required_plugin_dialog_active = True
 
         logging.info("Show RequiredPlugin dialog")
+        plugin_id = error.get_plugin_id()
+
         dialog = RequiredPluginDialog(
             error.get_plugin_id(),
             error.get_plugin_name(),