forked from Minki/linux
kunit: tool: drop last uses of collections.namedtuple
Since we formally require python3.7+ since commit df4b0807ca
("kunit: tool: Assert the version requirement"), we can just use
@dataclasses.dataclass instead.
In kunit_config.py, we used namedtuple to create a hashable type that
had `name` and `value` fields and had to subclass it to define a custom
`__str__()`.
@datalcass lets us just define one type instead.
In qemu_config.py, we use namedtuple to allow modules to define various
parameters. Using @dataclass, we can add type-annotations for all these
fields, making our code more typesafe and making it easier for users to
figure out how to define new configs.
Signed-off-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
parent
89aa72cd30
commit
e6f6192065
@ -6,16 +6,17 @@
|
||||
# Author: Felix Guo <felixguoxiuping@gmail.com>
|
||||
# Author: Brendan Higgins <brendanhiggins@google.com>
|
||||
|
||||
import collections
|
||||
from dataclasses import dataclass
|
||||
import re
|
||||
from typing import List, Set
|
||||
|
||||
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
|
||||
CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
|
||||
|
||||
KconfigEntryBase = collections.namedtuple('KconfigEntryBase', ['name', 'value'])
|
||||
|
||||
class KconfigEntry(KconfigEntryBase):
|
||||
@dataclass(frozen=True)
|
||||
class KconfigEntry:
|
||||
name: str
|
||||
value: str
|
||||
|
||||
def __str__(self) -> str:
|
||||
if self.value == 'n':
|
||||
|
@ -5,12 +5,15 @@
|
||||
# Copyright (C) 2021, Google LLC.
|
||||
# Author: Brendan Higgins <brendanhiggins@google.com>
|
||||
|
||||
from collections import namedtuple
|
||||
from dataclasses import dataclass
|
||||
from typing import List
|
||||
|
||||
|
||||
QemuArchParams = namedtuple('QemuArchParams', ['linux_arch',
|
||||
'kconfig',
|
||||
'qemu_arch',
|
||||
'kernel_path',
|
||||
'kernel_command_line',
|
||||
'extra_qemu_params'])
|
||||
@dataclass(frozen=True)
|
||||
class QemuArchParams:
|
||||
linux_arch: str
|
||||
kconfig: str
|
||||
qemu_arch: str
|
||||
kernel_path: str
|
||||
kernel_command_line: str
|
||||
extra_qemu_params: List[str]
|
||||
|
Loading…
Reference in New Issue
Block a user