quality: Please the linter gods?

Author: alexAubin

src/app.py

@@ -1451,12 +1451,11 @@ def _run_step(step):
         _run_step("post_init_as_root")
 
         # FIXME: i18n / ux
-        logger.info(f"Finalizing ...")
+        logger.info("Finalizing ...")
         _run_step("pre_finalize_as_root")
         _run_step("finalize")
         _run_step("post_finalize_as_root")
 
-
     if packaging_format >= 3:
         install_sequence()
 
@@ -1743,6 +1742,7 @@ def app_regen_conf(app: str, dry_run: bool, with_diff: bool = False) -> dict:
         # FIXME : to be consistent, we should also call the pre / post regenconf hook of the app if there are any
         return manager.apply()
 
+
 @is_unit_operation()
 def app_makedefault(
     operation_logger: "OperationLogger",

src/permission.py

@@ -161,15 +161,15 @@ def user_permission_list(
             g: infos["members"] for g, infos in user_group_list()["groups"].items()
         }
         for infos in permissions.values():
-            infos["corresponding_users"] = set()
+            corresponding_users = set()
             for group in infos["allowed"]:
                 # FIXME: somewhere we may want to have some sort of garbage collection
                 # to automatically remove user/groups from the "allowed" info when they
                 # somehow disappeared from the system (for example this may happen when
                 # restoring an app on which not all the user/group exist)
                 users_in_group = set(map_group_to_users.get(group, []))
-                infos["corresponding_users"] |= users_in_group
-            infos["corresponding_users"] = list(sorted(infos["corresponding_users"]))
+                corresponding_users |= users_in_group
+            infos["corresponding_users"] = list(sorted(corresponding_users))
     else:
         # Keep the output concise when used without --full, meant to not bloat CLI
         for infos in permissions.values():

src/service.py

@@ -22,11 +22,12 @@
 import re
 import subprocess
 import time
+import yaml
 from datetime import datetime
 from glob import glob
 from logging import getLogger
+from typing import TYPE_CHECKING, cast
 
-import yaml
 from moulinette import m18n, Moulinette
 from moulinette.utils.filesystem import (
     append_to_file,
@@ -46,7 +47,11 @@
 SERVICES_CONF = "/etc/yunohost/services.yml"
 SERVICES_CONF_BASE = "/usr/share/yunohost/conf/yunohost/services.yml"
 
-logger = getLogger("yunohost.service")
+if TYPE_CHECKING:
+    from moulinette.utils.log import MoulinetteLogger
+    logger = cast(MoulinetteLogger, getLogger("yunohost.service"))
+else:
+    logger = getLogger("yunohost.service")
 
 
 def service_add(

src/utils/form.py

@@ -18,11 +18,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-import ast
 import datetime
-import operator as op
 import os
-import re
 import shutil
 import tempfile
 import urllib.parse

src/utils/resources.py

@@ -28,7 +28,7 @@
 from typing import Any, Callable, Dict, List, Union
 
 from moulinette import m18n
-from moulinette.utils.filesystem import chmod, chown, mkdir, rm, write_to_file
+from moulinette.utils.filesystem import chmod, chown, mkdir, rm
 from moulinette.utils.process import check_output
 from moulinette.utils.text import random_ascii
 
@@ -40,6 +40,7 @@
 
 SOURCES_CACHE_DIR = "/var/tmp/yunohost/download/"
 
+
 class AppResourceManager:
     def __init__(self, app: str, current: Dict, wanted: Dict, workdir=None):
         self.app = app

src/utils/system.py

@@ -148,6 +148,7 @@ def ram_total():
 
     return (psutil.virtual_memory().total, psutil.swap_memory().total)
 
+
 def get_ynh_package_version(package):
     # Returns the installed version and release version ('stable' or 'testing'
     # or 'unstable')