Commit 3439ade8 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix: annoying warnings in python scripts

parent de4d380b

scripts/pyivastest/IvasBaseClass.py

+29 −30
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ class IvasLoggerConsoleHandler(logging.StreamHandler): 
        self.terminator = ""



    def filter(self, record):



        # Filter out any records that already go to the console

        if "console" in record.__dict__ and record.console is True:

            return False
@@ -299,7 +298,7 @@ class IvasBaseClass(object): 
                # replace /cygdrive/<drive> with <drive>:, everthing else should also with slashes...

                transformed_path = re.sub(

                    "^/cygdrive/(?P<drive>[a-z])/(?P<path>.*)",

                    "\g<drive>:/\g<path>",

                    r"\g<drive>:/\g<path>",

                    path,

                )

                # transformed_path = re.sub("/","\\\\",transformed_path)
@@ -307,7 +306,7 @@ class IvasBaseClass(object): 
                transformed_path = re.sub("\\\\", "/", path)

                transformed_path = re.sub(

                    "^(?P<drive>[a-z]):/(?P<path>.*)",

                    "/cygdrive/\g<drive>/\g<path>",

                    r"/cygdrive/\g<drive>/\g<path>",

                    transformed_path,

                )

            else:

scripts/pyivastest/IvasModeAnalyzer.py

+28 −32
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ class IvasModeAnalyzer(IvasModeCollector): 
            if foundline:

                value = line.split()[position]

                if strip_suffix == 1:

                    value = re.search("[0-9\.]*", value)[0]

                    value = re.search(r"[0-9\.]*", value)[0]

                return float(value)

        return float(value)
@@ -701,7 +701,6 @@ class IvasModeAnalyzer(IvasModeCollector): 
        return log_name



    def get_run_errors(self, failed_modes):



        if self.check.lower().startswith("clang"):

            num = int(self.check[-1])

            parse_func = functools.partial(self.parse_clang_log, clang_num=num)
@@ -772,7 +771,6 @@ class IvasModeAnalyzer(IvasModeCollector): 
        return num_total_errors



    def get_valgrind_errors(self):



        total_vg_errors = 0

        self.ls_modes()

        for mode, mode_dict in self.available_logs.items():
@@ -853,7 +851,6 @@ class IvasModeAnalyzer(IvasModeCollector): 
            self.selected_logs = deepcopy(self.available_logs)



    def get_instrumented_value(self, value, encdec=-1):



        if value in INSTRUMENTED_RESULTS:

            self.select_logs()

            if encdec == -1:
@@ -1024,7 +1021,6 @@ class IvasModeAnalyzer(IvasModeCollector): 
        self.html_table.append(tbl_row.format(row))



    def write_html_file(self, check, basefilename, revision):



        # create header for table

        hdr_tmpl = "<th>{}</th>"

scripts/pyivastest/IvasSvnBuilder.py

+30 −28
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ class IvasBuilder(IvasBaseClass): 
                for line in fileinput.input(options_h, inplace=True):

                    print(

                        re.sub(

                            "".join(["^[ ]*?/\*#define[ ]+?", cur_define, "[ ]*?\*/"]),

                            "".join(

                                [r"^[ ]*?/\*#define[ ]+?", cur_define, r"[ ]*?\*/"]

                            ),

                            "".join(["#define ", cur_define, " "]),

                            line,

                        ),