Fix formatting issue

Author: l0drex

tests/test_daemon_handler.py

@@ -35,8 +35,9 @@ def setUpClass(cls) -> None:
             with open(daemon_handler.SERVICE_PATH, 'r') as service:
                 lines = service.readlines()
             with open(daemon_handler.SERVICE_PATH, 'w') as service:
+                flatpak_exec = f'ExecStart={str(Path.home())}/.local/share/flatpak/exports/bin/sh.oskar.yin_yang --systemd'
                 for line in lines:
-                    service.write(re.sub('ExecStart=\/usr\/bin\/yin_yang --systemd', 'ExecStart='+str(Path.home())+'\/.local\/share\/flatpak\/exports\/bin\/sh.oskar.yin_yang --systemd', line))
+                    service.write(re.sub('ExecStart=/usr/bin/yin_yang --systemd', flatpak_exec, line))
         shutil.copyfile(daemon_handler.TIMER_PATH, daemon_handler.TIMER_PATH.with_suffix('.timer_backup'))
 
     @classmethod

yin_yang/__main__.py

@@ -1,24 +1,23 @@
 #!/bin/env python3
 
-import sys
 import logging
+import sys
 from argparse import ArgumentParser
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
-from threading import Timer
 
 from PySide6 import QtWidgets
-from PySide6.QtCore import QTranslator, QLibraryInfo, QLocale, QObject
+from PySide6.QtCore import QTranslator, QLibraryInfo, QLocale
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QSystemTrayIcon, QMenu
 from systemd import journal
 
-from yin_yang.helpers import is_flatpak
-from yin_yang.notification_handler import NotificationHandler
 from yin_yang import daemon_handler
-from yin_yang.meta import ConfigEvent
 from yin_yang import theme_switcher
 from yin_yang.config import config, Modes
+from yin_yang.helpers import is_flatpak
+from yin_yang.meta import ConfigEvent
+from yin_yang.notification_handler import NotificationHandler
 from yin_yang.repeat_timer import RepeatTimer
 from yin_yang.ui import main_window_connector
 

yin_yang/config.py

@@ -210,7 +210,7 @@ def load(self) -> None:
         if old_file.is_file():
             shutil.copyfile(old_file, config_path)
             os.remove(old_path)
-        
+
         # check if conf exists
         if config_path.is_file():
             if self._last_save_time == config_path.stat().st_mtime:

yin_yang/helpers.py

@@ -9,7 +9,7 @@
 
 """Base Flatpak Arguments
 
-These are the base arguments we use to execute commands when running in 
+These are the base arguments we use to execute commands when running in
 a flatpak environment.
 """
 base_flatpak_args = ['flatpak-spawn', '--host']

yin_yang/plugins/_plugin.py

@@ -255,7 +255,7 @@ def set_theme(self, theme: str):
 
 class DBusPlugin(Plugin):
     """A class for plugins that mainly switching theme via DBus"""
-    
+
     def __init__(self):
         super().__init__()
         self.connection = QDBusConnection.sessionBus()
@@ -280,8 +280,9 @@ def list_paths(self, service: str, path: str) -> List[str]:
         """ Get all subpath under a given pth of service
         :path: should start with / but without / on its end
         """
-        
-        assert path.startswith('/') and not path.endswith('/'), "list_paths wrong, :path: should start with / but without / on its end"
+
+        assert path.startswith('/') and not path.endswith('/'), \
+            "list_paths wrong, :path: should start with / but without / on its end"
         msg = QDBusMessage.createMethodCall(service, path, "org.freedesktop.DBus.Introspectable", "Introspect")
         reply = self.connection.call(msg)
         if reply.errorName():
@@ -314,7 +315,7 @@ def open_config(self, path: Path):
                 case FileFormat.JSON.value:
                     try:
                         return json.load(file)
-                    except json.decoder.JSONDecodeError as e:
+                    except json.decoder.JSONDecodeError:
                         return self.default_config
                 case FileFormat.CONFIG.value:
                     config = ConfigParser()
@@ -385,6 +386,7 @@ def flatpak_user(app_id: str) -> Path:
 def snap_path(app: str) -> Path:
     return Path(f'/var/lib/snapd/snap/{app}/current')
 
+
 def themes_from_theme_directories(type: str) -> List[Path]:
     theme_directories = [
         Path('/usr/share/themes'),

yin_yang/plugins/firefox.py

@@ -44,7 +44,7 @@ def available_themes(self) -> dict:
                     for addon in content['addons']:
                         if addon['type'] == 'theme':
                             themes[addon['id']] = addon['defaultLocale']['name']
-            except FileNotFoundError as _:
+            except FileNotFoundError:
                 logger.warning(f'Firefox profile has no extensions installed: {path}')
                 continue
 

yin_yang/plugins/gtk.py

@@ -1,19 +1,17 @@
 import logging
-from os import path, scandir
 from pathlib import Path
 
 from PySide6.QtDBus import QDBusMessage
 
 from yin_yang import helpers
-
-from ..meta import Desktop
 from ._plugin import (
     DBusPlugin,
     PluginCommandline,
     PluginDesktopDependent,
     themes_from_theme_directories,
 )
 from .system import test_gnome_availability
+from ..meta import Desktop
 
 logger = logging.getLogger(__name__)
 
@@ -124,6 +122,7 @@ def set_theme(self, theme: str):
         color_scheme = 'prefer-dark' if theme == self.theme_dark else 'prefer-light'
         helpers.run(['gsettings', 'set', 'org.gnome.desktop.interface', 'color-scheme', f'{color_scheme}'])
 
+
 class _Xfce(PluginCommandline):
     def __init__(self):
         super(_Xfce, self).__init__(

yin_yang/plugins/konsole.py

@@ -236,7 +236,6 @@ def create_profiles(self):
         with open(dark_profile, 'w') as file:
             profile_config.write(file)
 
-
     def set_profile(self, service: str, profile: str, set_default_profile: bool = False):
         if set_default_profile:
             path = '/Sessions'

yin_yang/plugins/wallpaper.py

@@ -1,14 +1,13 @@
 import logging
-import subprocess
 from pathlib import Path
 
-from PySide6.QtWidgets import QDialogButtonBox, QVBoxLayout, QWidget, QLineEdit
 from PySide6.QtDBus import QDBusMessage
-from yin_yang import helpers
+from PySide6.QtWidgets import QDialogButtonBox, QVBoxLayout, QWidget, QLineEdit
 
-from ..meta import Desktop
+from yin_yang import helpers
 from ._plugin import PluginDesktopDependent, PluginCommandline, DBusPlugin
 from .system import test_gnome_availability
+from ..meta import Desktop
 
 logger = logging.getLogger(__name__)