From bf5bef114c837b2aa8a268edfdfaaffecc63082e Mon Sep 17 00:00:00 2001 From: Sven Sager Date: Fri, 6 Feb 2026 16:53:02 +0100 Subject: [PATCH] chore: Reformat with black Signed-off-by: Sven Sager --- src/revpi_middleware/__about__.py | 1 + src/revpi_middleware/__init__.py | 1 + src/revpi_middleware/cli_commands/__init__.py | 1 + src/revpi_middleware/cli_commands/cli_base.py | 1 + src/revpi_middleware/cli_commands/cli_config.py | 3 ++- src/revpi_middleware/cli_commands/cli_picontrol.py | 1 + src/revpi_middleware/cli_commands/dbus_helper.py | 1 + src/revpi_middleware/daemon.py | 1 + src/revpi_middleware/dbus_middleware1/__init__.py | 1 + src/revpi_middleware/dbus_middleware1/bus_provider.py | 1 + src/revpi_middleware/dbus_middleware1/dbus_helper.py | 1 + .../dbus_middleware1/process_image/__init__.py | 1 + .../dbus_middleware1/process_image/interface_picontrol.py | 1 + .../dbus_middleware1/process_image/process_image_helper.py | 1 + .../dbus_middleware1/system_config/__init__.py | 1 + .../dbus_middleware1/system_config/interface_config.py | 1 + .../dbus_middleware1/system_config/interface_services.py | 1 + src/revpi_middleware/main_application.py | 1 + src/revpi_middleware/proginit.py | 1 + 19 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/revpi_middleware/__about__.py b/src/revpi_middleware/__about__.py index a3e52d4..2324e0d 100644 --- a/src/revpi_middleware/__about__.py +++ b/src/revpi_middleware/__about__.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Metadata of package.""" + __author__ = "Sven Sager" __copyright__ = "Copyright (C) 2025 KUNBUS GmbH" __license__ = " GPL-2.0-or-later" diff --git a/src/revpi_middleware/__init__.py b/src/revpi_middleware/__init__.py index 68e760d..e725fe5 100644 --- a/src/revpi_middleware/__init__.py +++ b/src/revpi_middleware/__init__.py @@ -2,4 +2,5 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Package: revpi_middleware.""" + from .__about__ import __author__, __copyright__, __license__, __version__ diff --git a/src/revpi_middleware/cli_commands/__init__.py b/src/revpi_middleware/cli_commands/__init__.py index d2194e8..55030d8 100644 --- a/src/revpi_middleware/cli_commands/__init__.py +++ b/src/revpi_middleware/cli_commands/__init__.py @@ -2,4 +2,5 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """CLI commands to control revpi_middleware.""" + from ..__about__ import __author__, __copyright__, __license__, __version__ diff --git a/src/revpi_middleware/cli_commands/cli_base.py b/src/revpi_middleware/cli_commands/cli_base.py index e0ff36f..cfd13e4 100644 --- a/src/revpi_middleware/cli_commands/cli_base.py +++ b/src/revpi_middleware/cli_commands/cli_base.py @@ -5,6 +5,7 @@ This module provides the foundation for the RevPi middleware CLI commands and argument parsing setup. """ + from logging import getLogger from . import cli_config, cli_picontrol diff --git a/src/revpi_middleware/cli_commands/cli_config.py b/src/revpi_middleware/cli_commands/cli_config.py index d91b39c..3f1d645 100644 --- a/src/revpi_middleware/cli_commands/cli_config.py +++ b/src/revpi_middleware/cli_commands/cli_config.py @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Command-Line for the picontrol object of CLI.""" + from argparse import ArgumentParser from logging import getLogger @@ -16,7 +17,7 @@ def add_subparsers(parent_parser: ArgumentParser): "action", choices=["enable", "disable", "status", "available", "list-features"], help="Action to be executed: enable, disable, status or available. " - "To get all available features, use 'list-features'.", + "To get all available features, use 'list-features'.", ) parent_parser.add_argument( "feature", diff --git a/src/revpi_middleware/cli_commands/cli_picontrol.py b/src/revpi_middleware/cli_commands/cli_picontrol.py index becac3e..d94df27 100644 --- a/src/revpi_middleware/cli_commands/cli_picontrol.py +++ b/src/revpi_middleware/cli_commands/cli_picontrol.py @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Command-Line for the picontrol object of CLI.""" + from argparse import ArgumentParser from logging import getLogger diff --git a/src/revpi_middleware/cli_commands/dbus_helper.py b/src/revpi_middleware/cli_commands/dbus_helper.py index 45d6690..7247913 100644 --- a/src/revpi_middleware/cli_commands/dbus_helper.py +++ b/src/revpi_middleware/cli_commands/dbus_helper.py @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus helper functions for cli commands.""" + from enum import Enum from threading import Thread from time import sleep diff --git a/src/revpi_middleware/daemon.py b/src/revpi_middleware/daemon.py index 704103e..f939bc5 100644 --- a/src/revpi_middleware/daemon.py +++ b/src/revpi_middleware/daemon.py @@ -44,6 +44,7 @@ class MiddlewareDaemon: dbus_middleware_running = self.bus_provider and self.bus_provider.is_alive() if not dbus_middleware_running: + self.bus_provider = BusProvider(use_system_bus=not pi.pargs.use_session_bus) self.bus_provider.start() diff --git a/src/revpi_middleware/dbus_middleware1/__init__.py b/src/revpi_middleware/dbus_middleware1/__init__.py index 6b65020..d032591 100644 --- a/src/revpi_middleware/dbus_middleware1/__init__.py +++ b/src/revpi_middleware/dbus_middleware1/__init__.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus middleware version 1 of revpi_middleware.""" + from .dbus_helper import REVPI_DBUS_BASE_PATH, REVPI_DBUS_NAME from .dbus_helper import extend_interface diff --git a/src/revpi_middleware/dbus_middleware1/bus_provider.py b/src/revpi_middleware/dbus_middleware1/bus_provider.py index d2ce943..a14aeed 100644 --- a/src/revpi_middleware/dbus_middleware1/bus_provider.py +++ b/src/revpi_middleware/dbus_middleware1/bus_provider.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus bus provider for revpi_middleware.""" + from logging import getLogger from threading import Thread diff --git a/src/revpi_middleware/dbus_middleware1/dbus_helper.py b/src/revpi_middleware/dbus_middleware1/dbus_helper.py index a09b14f..11b9194 100644 --- a/src/revpi_middleware/dbus_middleware1/dbus_helper.py +++ b/src/revpi_middleware/dbus_middleware1/dbus_helper.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Helper for dbus.""" + from logging import getLogger from typing import Union diff --git a/src/revpi_middleware/dbus_middleware1/process_image/__init__.py b/src/revpi_middleware/dbus_middleware1/process_image/__init__.py index 73a9bdc..2f12264 100644 --- a/src/revpi_middleware/dbus_middleware1/process_image/__init__.py +++ b/src/revpi_middleware/dbus_middleware1/process_image/__init__.py @@ -2,4 +2,5 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus interfaces for piControl driver.""" + from .interface_picontrol import InterfacePiControl diff --git a/src/revpi_middleware/dbus_middleware1/process_image/interface_picontrol.py b/src/revpi_middleware/dbus_middleware1/process_image/interface_picontrol.py index 8c00918..4abff1f 100644 --- a/src/revpi_middleware/dbus_middleware1/process_image/interface_picontrol.py +++ b/src/revpi_middleware/dbus_middleware1/process_image/interface_picontrol.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus interfaces for piControl.""" + from logging import getLogger from pydbus.generic import signal diff --git a/src/revpi_middleware/dbus_middleware1/process_image/process_image_helper.py b/src/revpi_middleware/dbus_middleware1/process_image/process_image_helper.py index 5fcb2a6..458a496 100644 --- a/src/revpi_middleware/dbus_middleware1/process_image/process_image_helper.py +++ b/src/revpi_middleware/dbus_middleware1/process_image/process_image_helper.py @@ -7,6 +7,7 @@ Helper for the process image. The ResetDriverWatchdog class is a copy of revpipyload project module "watchdogs" https://github.com/naruxde/revpipyload/blob/b51c2b617a57cc7d96fd67e1da9f090a0624eacb/src/revpipyload/watchdogs.py """ + import os from ctypes import c_int from fcntl import ioctl diff --git a/src/revpi_middleware/dbus_middleware1/system_config/__init__.py b/src/revpi_middleware/dbus_middleware1/system_config/__init__.py index 2b51c7a..30e59e5 100644 --- a/src/revpi_middleware/dbus_middleware1/system_config/__init__.py +++ b/src/revpi_middleware/dbus_middleware1/system_config/__init__.py @@ -2,5 +2,6 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus interfaces for system configuration.""" + from .interface_config import InterfaceRevpiConfig from .interface_services import InterfaceSoftwareServices diff --git a/src/revpi_middleware/dbus_middleware1/system_config/interface_config.py b/src/revpi_middleware/dbus_middleware1/system_config/interface_config.py index 9818583..e63b65b 100644 --- a/src/revpi_middleware/dbus_middleware1/system_config/interface_config.py +++ b/src/revpi_middleware/dbus_middleware1/system_config/interface_config.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus interfaces for hardware configuration.""" + from collections import namedtuple from logging import getLogger diff --git a/src/revpi_middleware/dbus_middleware1/system_config/interface_services.py b/src/revpi_middleware/dbus_middleware1/system_config/interface_services.py index ac08b09..5ef0e8f 100644 --- a/src/revpi_middleware/dbus_middleware1/system_config/interface_services.py +++ b/src/revpi_middleware/dbus_middleware1/system_config/interface_services.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """D-Bus interfaces for software services.""" + from logging import getLogger from typing import List diff --git a/src/revpi_middleware/main_application.py b/src/revpi_middleware/main_application.py index 8df7aae..36dc7b5 100644 --- a/src/revpi_middleware/main_application.py +++ b/src/revpi_middleware/main_application.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2025 KUNBUS GmbH # SPDX-License-Identifier: GPL-2.0-or-later """Main application of revpi-middleware daemon.""" + from logging import getLogger from .daemon import MiddlewareDaemon diff --git a/src/revpi_middleware/proginit.py b/src/revpi_middleware/proginit.py index 5a0a092..7b8e155 100644 --- a/src/revpi_middleware/proginit.py +++ b/src/revpi_middleware/proginit.py @@ -2,6 +2,7 @@ # SPDX-FileCopyrightText: 2018-2023 Sven Sager # SPDX-License-Identifier: LGPL-2.0-or-later """Global program initialization.""" + __author__ = "Sven Sager" __copyright__ = "Copyright (C) 2018-2023 Sven Sager" __license__ = "LGPL-2.0-or-later"