26
26
import json
27
27
import logging
28
28
import multiprocessing
29
- import operator
30
- import re
31
29
import resource
32
30
import time
33
31
import zipfile
34
32
35
- # noinspection PyUnresolvedReferences
36
- from aux .mea import DEFAULT_CONVERSION_FUNCTION , CONVERSION_FUNCTION_MODEL_FUNCTIONS , \
37
- CONVERSION_FUNCTION_CALL_TREE , CONVERSION_FUNCTION_NOTES , convert_error_trace , \
38
- compare_error_traces , is_equivalent , DEFAULT_COMPARISON_FUNCTION , \
39
- DEFAULT_SIMILARITY_THRESHOLD , TAG_COMPARISON_FUNCTION , TAG_CONVERSION_FUNCTION , \
40
- TAG_ADDITIONAL_MODEL_FUNCTIONS , CONVERSION_FUNCTION_FULL
41
-
42
33
from aux .common import *
43
34
from components import *
44
35
from components .component import Component
36
+ from mea .core import *
37
+ from mea .et import import_error_trace
45
38
46
39
ERROR_TRACE_FILE = "error trace.json"
47
40
CONVERTED_ERROR_TRACES = "converted error traces.json"
@@ -86,7 +79,6 @@ def __init__(self, general_config: dict, error_traces: list, install_dir: str, r
86
79
os .makedirs (self .result_dir , exist_ok = True )
87
80
else :
88
81
self .result_dir = None
89
- self .__export_et_parser_lib ()
90
82
self .rule = rule
91
83
92
84
# List of files with error traces.
@@ -323,6 +315,7 @@ def __print_trace_archive(self, error_trace_file_name: str, witness_type=WITNESS
323
315
'reports' ,
324
316
)
325
317
django .setup ()
318
+ self .__export_et_parser_lib ()
326
319
# noinspection PyUnresolvedReferences
327
320
from reports .etv import convert_json_trace_to_html
328
321
with open (json_trace_name , encoding = "utf8" ) as trace_file :
@@ -348,11 +341,8 @@ def __process_parsed_trace(parsed_error_trace: dict):
348
341
parsed_error_trace ['files' ] = src_files
349
342
350
343
def __parse_trace (self , error_trace_file : str , supported_types : set ) -> dict :
351
- # noinspection PyUnresolvedReferences
352
- from core .vrp .et import import_error_trace
353
-
354
344
# Those messages are waste of space.
355
- logger = self ._create_logger (
345
+ logger = Component ._create_logger (
356
346
"Witness processor" , logging .WARNING if self .debug else logging .ERROR
357
347
)
358
348
try :
@@ -429,9 +419,6 @@ def __get_option_for_rule(self, tag: str, default_value):
429
419
return self .component_config .get (self .rule , {}).get (tag , default )
430
420
431
421
def __export_et_parser_lib (self ):
432
- et_parser_lib = self .get_tool_path (self ._get_tool_default_path (ET_LIB ),
433
- self .config .get (TAG_TOOLS , {}).get (ET_LIB ))
434
- sys .path .append (et_parser_lib )
435
422
et_html_lib = self .get_tool_path (self ._get_tool_default_path (ET_HTML_LIB ),
436
423
self .config .get (TAG_TOOLS , {}).get (ET_HTML_LIB ))
437
424
sys .path .append (et_html_lib )
0 commit comments