From: Daan De Meyer Date: Thu, 5 Sep 2024 12:30:24 +0000 (+0200) Subject: Mark all class variables as Final X-Git-Tag: v25~314^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16f4c949307d325cf92ad323b3a8b49301fb01b3;p=thirdparty%2Fmkosi.git Mark all class variables as Final --- diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py index c576a67f4..a111dd25b 100644 --- a/mkosi/installer/apt.py +++ b/mkosi/installer/apt.py @@ -4,7 +4,7 @@ import dataclasses import textwrap from collections.abc import Sequence from pathlib import Path -from typing import Optional +from typing import Final, Optional from mkosi.config import PACKAGE_GLOBS, Config, ConfigFeature from mkosi.context import Context @@ -37,7 +37,7 @@ class AptRepository: class Apt(PackageManager): - documentation_exclude_globs = [ + documentation_exclude_globs: Final[list[str]] = [ "usr/share/doc/*", "usr/share/man/*", "usr/share/groff/*", diff --git a/mkosi/log.py b/mkosi/log.py index e264c4dec..15fddad47 100644 --- a/mkosi/log.py +++ b/mkosi/log.py @@ -6,7 +6,7 @@ import logging import os import sys from collections.abc import Iterator -from typing import Any, NoReturn, Optional +from typing import Any, Final, NoReturn, Optional # This global should be initialized after parsing arguments ARG_DEBUG = contextvars.ContextVar("debug", default=False) @@ -15,12 +15,12 @@ LEVEL = 0 class Style: - bold = "\033[0;1;39m" if sys.stderr.isatty() else "" - blue = "\033[0;1;34m" if sys.stderr.isatty() else "" - gray = "\033[0;38;5;245m" if sys.stderr.isatty() else "" - red = "\033[31;1m" if sys.stderr.isatty() else "" - yellow = "\033[33;1m" if sys.stderr.isatty() else "" - reset = "\033[0m" if sys.stderr.isatty() else "" + bold: Final[str] = "\033[0;1;39m" if sys.stderr.isatty() else "" + blue: Final[str] = "\033[0;1;34m" if sys.stderr.isatty() else "" + gray: Final[str] = "\033[0;38;5;245m" if sys.stderr.isatty() else "" + red: Final[str] = "\033[31;1m" if sys.stderr.isatty() else "" + yellow: Final[str] = "\033[33;1m" if sys.stderr.isatty() else "" + reset: Final[str] = "\033[0m" if sys.stderr.isatty() else "" def die(message: str, diff --git a/mkosi/partition.py b/mkosi/partition.py index 41d243f50..58949216e 100644 --- a/mkosi/partition.py +++ b/mkosi/partition.py @@ -3,7 +3,7 @@ import json import subprocess from collections.abc import Mapping, Sequence from pathlib import Path -from typing import Any, Optional +from typing import Any, Final, Optional from mkosi.log import die from mkosi.run import SandboxProtocol, nosandbox, run @@ -27,7 +27,7 @@ class Partition: roothash=dict.get("roothash"), ) - GRUB_BOOT_PARTITION_UUID = "21686148-6449-6e6f-744e-656564454649" + GRUB_BOOT_PARTITION_UUID: Final[str] = "21686148-6449-6e6f-744e-656564454649" def find_partitions(image: Path, *, sandbox: SandboxProtocol = nosandbox) -> list[Partition]: diff --git a/mkosi/versioncomp.py b/mkosi/versioncomp.py index 56da1ad2f..41619c33d 100644 --- a/mkosi/versioncomp.py +++ b/mkosi/versioncomp.py @@ -3,6 +3,7 @@ import functools import itertools import string +from typing import Final @functools.total_ordering @@ -10,9 +11,9 @@ class GenericVersion: # These constants follow the convention of the return value of rpmdev-vercmp that are followe # by systemd-analyze compare-versions when called with only two arguments (without a comparison # operator), recreated in the compare_versions method. - _EQUAL = 0 - _RIGHT_SMALLER = 1 - _LEFT_SMALLER = -1 + _EQUAL: Final[int] = 0 + _RIGHT_SMALLER: Final[int] = 1 + _LEFT_SMALLER: Final[int] = -1 def __init__(self, version: str): self._version = version