Kleaf: init_ddk: Wrap KleafProjectSetter as @dataclass
* This is a no-op refactor.
Bug: 328770706
Change-Id: I1adb7cd4ba46f21204a163df2102f5fe02b0ece9
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
diff --git a/init/init_ddk.py b/init/init_ddk.py
index dbd7e35..269d9b2 100644
--- a/init/init_ddk.py
+++ b/init/init_ddk.py
@@ -17,6 +17,7 @@
"""Configures the project layout to build DDK modules."""
import argparse
+import dataclasses
import json
import logging
import pathlib
@@ -58,13 +59,16 @@
pass
+@dataclasses.dataclass(kw_only=True)
class KleafProjectSetter:
"""Configures the project layout to build DDK modules."""
- def __init__(self, cmd_args: argparse.Namespace):
- self.ddk_workspace: pathlib.Path | None = cmd_args.ddk_workspace
- self.kleaf_repo: pathlib.Path | None = cmd_args.kleaf_repo
- self.prebuilts_dir: pathlib.Path | None = cmd_args.prebuilts_dir
+ build_id: str | None
+ build_target: str | None
+ ddk_workspace: pathlib.Path | None
+ kleaf_repo: pathlib.Path | None
+ prebuilts_dir: pathlib.Path | None
+ url_fmt: str | None
def _symlink_tools_bazel(self):
if not self.ddk_workspace or not self.kleaf_repo:
@@ -250,7 +254,7 @@
format="%(levelname)s: %(message)s")
try:
- KleafProjectSetter(cmd_args=args).run()
+ KleafProjectSetter(**vars(args)).run()
except KleafProjectSetterError as e:
logging.error(e, exc_info=e)
sys.exit(1)
diff --git a/init/init_ddk_test.py b/init/init_ddk_test.py
index cc9cc9e..6fdc436 100644
--- a/init/init_ddk_test.py
+++ b/init/init_ddk_test.py
@@ -14,7 +14,6 @@
"""Tests for init_ddk.py"""
-import argparse
import logging
import pathlib
import tempfile
@@ -109,15 +108,12 @@
prebuilts_dir = temp_dir / "prebuilts_dir"
try:
init_ddk.KleafProjectSetter(
- argparse.Namespace(
- build_id=None,
- build_target=None,
- ddk_workspace=ddk_workspace,
- kleaf_repo=kleaf_repo,
- local=None,
- prebuilts_dir=prebuilts_dir,
- url_fmt=None,
- )
+ build_id=None,
+ build_target=None,
+ ddk_workspace=ddk_workspace,
+ kleaf_repo=kleaf_repo,
+ prebuilts_dir=prebuilts_dir,
+ url_fmt=None,
).run()
except: # pylint: disable=bare-except
pass
@@ -133,15 +129,12 @@
ddk_workspace = temp_dir / "ddk_workspace"
try:
init_ddk.KleafProjectSetter(
- argparse.Namespace(
- build_id=None,
- build_target=None,
- ddk_workspace=ddk_workspace,
- kleaf_repo=temp_dir / "kleaf_repo",
- local=None,
- prebuilts_dir=None,
- url_fmt=None,
- )
+ build_id=None,
+ build_target=None,
+ ddk_workspace=ddk_workspace,
+ kleaf_repo=temp_dir / "kleaf_repo",
+ prebuilts_dir=None,
+ url_fmt=None,
).run()
except: # pylint: disable=bare-except
pass
@@ -161,15 +154,12 @@
download_configs.write_text("{}")
try:
init_ddk.KleafProjectSetter(
- argparse.Namespace(
- build_id=None,
- build_target=None,
- ddk_workspace=ddk_workspace,
- kleaf_repo=None,
- local=None,
- prebuilts_dir=prebuilts_dir,
- url_fmt=None,
- )
+ build_id=None,
+ build_target=None,
+ ddk_workspace=ddk_workspace,
+ kleaf_repo=None,
+ prebuilts_dir=prebuilts_dir,
+ url_fmt=None,
).run()
except: # pylint: disable=bare-except
pass
