chore: use from __future__ import annotations

This commit is contained in:
mayeut
2022-07-19 07:47:45 +02:00
parent 054230e01b
commit 6d27f05c7c
71 changed files with 285 additions and 166 deletions
+8 -7
View File
@@ -1,8 +1,9 @@
from __future__ import annotations
import functools
import platform as platform_module
import re
from enum import Enum
from typing import Set
from .typing import Final, Literal, PlatformName, assert_never
@@ -32,11 +33,11 @@ class Architecture(Enum):
ARM64 = "ARM64"
# Allow this to be sorted
def __lt__(self, other: "Architecture") -> bool:
def __lt__(self, other: Architecture) -> bool:
return self.value < other.value
@staticmethod
def parse_config(config: str, platform: PlatformName) -> "Set[Architecture]":
def parse_config(config: str, platform: PlatformName) -> set[Architecture]:
result = set()
for arch_str in re.split(r"[\s,]+", config):
if arch_str == "auto":
@@ -54,7 +55,7 @@ class Architecture(Enum):
return result
@staticmethod
def auto_archs(platform: PlatformName) -> "Set[Architecture]":
def auto_archs(platform: PlatformName) -> set[Architecture]:
native_architecture = Architecture(platform_module.machine())
result = {native_architecture}
@@ -72,7 +73,7 @@ class Architecture(Enum):
return result
@staticmethod
def all_archs(platform: PlatformName) -> "Set[Architecture]":
def all_archs(platform: PlatformName) -> set[Architecture]:
all_archs_map = {
"linux": {
Architecture.x86_64,
@@ -87,7 +88,7 @@ class Architecture(Enum):
return all_archs_map[platform]
@staticmethod
def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "Set[Architecture]":
def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> set[Architecture]:
archs_32 = {Architecture.i686, Architecture.x86}
auto_archs = Architecture.auto_archs(platform)
@@ -101,7 +102,7 @@ class Architecture(Enum):
def allowed_architectures_check(
platform: PlatformName,
architectures: Set[Architecture],
architectures: set[Architecture],
) -> None:
allowed_architectures = Architecture.all_archs(platform)