Merge pull request #678 from yql70/main

🎨update tool-infer and tool-flow
Tencent · Oct 28, 2022 · c0afaf3 · c0afaf3
2 parents 3b8ea78 + b43d68b
commit c0afaf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/tool/flow.py b/client/tool/flow.py
@@ -59,7 +59,8 @@ def analyze(self, params):
         SubProcController(["flow", "stop"], cwd=source_dir).wait()
 
         # 删除flow生成的配置文件，并将客户代码库自身的配置文件拷贝会代码库中，恢复现场
-        os.remove(config_file)
+        if os.path.exists(config_file):
+            os.remove(config_file)
         if os.path.exists(user_config_file):
             copyfile(user_config_file, config_file)
 

diff --git a/client/tool/util/infer.py b/client/tool/util/infer.py
@@ -13,7 +13,6 @@
 import shlex
 import os
 import json
-import ijson
 
 from util.subprocc import SubProcController
 from util.logutil import LogPrinter
@@ -286,6 +285,8 @@ def _large_json_handle(self, error_output, rules, issues):
         ]
         :return:
         """
+        import ijson
+
         f = open(error_output, "r")
         parser = ijson.parse(f)
         is_in_issue = False