From e4cd5fbcc63cd03480a9c398b50d1023db8f8ff2 Mon Sep 17 00:00:00 2001
From: lubinglun <lubinglun@huawei.com>
Date: Sun, 23 Oct 2022 12:56:39 +0000
Subject: [PATCH] fix loader's format and import

Signed-off-by: lubinglun <lubinglun@huawei.com>
Change-Id: I9c764aebf8e3b0a12dd3a49acaf2f991bffad9d9
---
 hb_new/services/loader.py | 12 ------------
 loader/load.py            |  6 ++----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/hb_new/services/loader.py b/hb_new/services/loader.py
index 13a2f9e..40f838a 100644
--- a/hb_new/services/loader.py
+++ b/hb_new/services/loader.py
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from cmath import log
 import os
 
 from services.interface.loadInterface import LoadInterface
@@ -43,16 +42,13 @@ class OHOSLoader(LoadInterface):
         self.subsystem_config_file = ""
         self.platforms_config_file = ""
         self.exclusion_modules_config_file = ""
-
         self.example_subsystem_file = ""
         self.scalable_build = ""
         self.build_platform_name = ""
         self.build_xts = ""
         self.ignore_api_check = ""
         self.load_test_config = ""
-
         self.subsystem_configs = ""
-
         self._subsystem_info = ""
 
     def __post_init__(self):
@@ -81,13 +77,11 @@ class OHOSLoader(LoadInterface):
         self.build_xts = self.args_dict['build_xts']
         self.ignore_api_check = self.args_dict['ignore_api_check']
         self.load_test_config = self.args_dict['load_test_config']
-
         self.subsystem_configs = subsystem_scan.scan(self.subsystem_config_file,
                                                      self.example_subsystem_file,
                                                      self.source_root_dir)
 
         self._subsystem_info = self.subsystem_configs.get('subsystem')
-
         self._platforms_info = platforms_loader.get_platforms_info(
             self.platforms_config_file,
             self.source_root_dir,
@@ -95,7 +89,6 @@ class OHOSLoader(LoadInterface):
             self.target_arch,
             self.config_output_relpath,
             self.scalable_build)
-
         self.variant_toolchains = self._platforms_info.get('variant_toolchain_info').get('platform_toolchain')
         self._all_platforms = self.variant_toolchains.keys()
         self.build_platforms = self._get_build_platforms()
@@ -109,18 +102,13 @@ class OHOSLoader(LoadInterface):
             self.exclusion_modules_config_file,
             self.load_test_config,
             self.build_xts)
-
         self.parts_targets = self.parts_config_info.get('parts_targets')
         self.phony_targets = self.parts_config_info.get('phony_target')
         self.parts_info = self.parts_config_info.get('parts_info')
         self.target_platform_parts = self._get_platforms_all_parts()
-
         self.target_platform_stubs = self._get_platforms_all_stubs()
-
         self.required_parts_targets_list = self._get_required_build_parts_list()
-
         self.required_phony_targets = self._get_required_phony_targets()
-
         self.required_parts_targets = self._get_required_build_targets()
 
 # check method
diff --git a/loader/load.py b/loader/load.py
index f33caf5..c70a652 100755
--- a/loader/load.py
+++ b/loader/load.py
@@ -336,10 +336,8 @@ def generate_syscap_files(parts_config_info, target_platform_parts, pre_syscap_i
     syscap_info_json = os.path.join(system_etc_path, "SystemCapability.json")
     write_json_file(syscap_info_json, syscap_info_dict)
     target_syscap_with_part_name_list.sort(key=syscap_sort)
-    syscap_info_with_part_name_file = os.path.join(
-        system_etc_path, "syscap.json")
-    write_json_file(syscap_info_with_part_name_file, {
-                    'components': target_syscap_with_part_name_list})
+    syscap_info_with_part_name_file = os.path.join(system_etc_path, "syscap.json")
+    write_json_file(syscap_info_with_part_name_file, {'components': target_syscap_with_part_name_list})
     if not os.path.exists(os.path.join(system_etc_path, "param/")):
         os.mkdir(os.path.join(system_etc_path, "param/"))
     target_syscap_for_init_file = os.path.join(
-- 
Gitee