Comply with flake8 in tox

soimkim · soimkim · commit 31bcd0a2c94f · 2023-02-20T17:32:50.000+09:00
diff --git a/src/fosslight_android/_common.py b/src/fosslight_android/_common.py
@@ -125,47 +125,47 @@ def get_print_items(self):
         source_path = self.source_code_path
         item_license = self.license
 
-        need_check, comment = get_comment(self.comment, item_license, oss_name, self.notice, source_path)
-        print_items_txt.append(
-            self.bin_name + '\t' + source_path + '\t' + self.notice +
-            '\t' + oss_name + '\t' + self.oss_version + '\t' +
-            self.license + '\t' + need_check + '\t' + comment +
-            '\t' + self.tlsh + '\t' + self.checksum)
+        empty_columns, license_to_notice = check_empty_column(item_license, oss_name, source_path)
+        comment = get_comment(self.comment, license_to_notice, self.notice, empty_columns)
+        if comment != "":
+            need_check = "O"
+        print_items_txt.append(f"{self.bin_name}\t{source_path}\t{self.notice}\t"
+                               f"{oss_name}\t{self.oss_version}\t{self.license}\t{need_check}\t{comment}\t{self.tlsh}\t{self.checksum}")
         repo_link = self.download_location if self.is_new_bin else ""
         print_items_excel.append([self.bin_name, source_path, self.notice, oss_name,
                                   self.oss_version, self.license, repo_link, repo_link, '', '', '', comment, need_check])
 
         if self.additional_oss_items is not None:
             for item in self.additional_oss_items:
-                print_items_txt.append(
-                    self.bin_name + '\t' + source_path + '\t' + self.notice +
-                    '\t' + item + '\t' + need_check + '\t' + comment +
-                    '\t' + self.tlsh + '\t' + self.checksum)
+                print_items_txt.append(f"{self.bin_name}\t{source_path}\t{self.notice}\t{item}"
+                                       f"\t{need_check}\t{comment}\t{self.tlsh}\t{self.checksum}")
                 excel_item = [self.bin_name, source_path, self.notice]
                 excel_item.extend(item.split('\t'))
                 excel_item.extend(['', '', '', '', '', comment, need_check])
                 print_items_excel.append(excel_item)
         return print_items_txt, print_items_excel
 
 
-def get_comment(default_comment, license, oss_name, notice_value, directory):
-    need_check = ""
-    comment = ""
+def check_empty_column(license, oss_name, directory):
     empty_columns = []
     license_to_notice = True
 
-    if license == CONST_NULL:
-        empty_columns.append('License')
-    else:
+    if license != CONST_NULL:
         for license_item in license.split(','):
             if license_item in skip_license:
                 license_to_notice = False
                 break
-
+    else:
+        empty_columns.append('License')
     if oss_name == CONST_NULL and license_to_notice:
         empty_columns.append('OSS Name')
     if directory == CONST_NULL:
         empty_columns.append('Source Code Path')
+    return empty_columns, license_to_notice
+
+
+def get_comment(default_comment, license_to_notice, notice_value, empty_columns):
+    comment = ""
 
     if empty_columns is not None and len(empty_columns) > 0:
         comment = "Fill in " + ",".join(empty_columns) + "."
@@ -180,12 +180,9 @@ def get_comment(default_comment, license, oss_name, notice_value, directory):
             comment += "/"
         comment += "Add NOTICE to proper path."
 
-    if comment != "":
-        need_check = "O"
-
     comment = default_comment + comment  # Paste Auto ID comment in front.
 
-    return need_check, comment
+    return comment
 
 
 def set_value_switch(bin, key, value):
diff --git a/src/fosslight_android/android_binary_analysis.py b/src/fosslight_android/android_binary_analysis.py
@@ -243,19 +243,19 @@ def find_binaries_from_out_dir():
     obj_static_lib = os.path.join(build_out_path, "obj/STATIC_LIBRARIES")
     font_path = os.path.join(build_out_path, "system/fonts")
     cmd_list = [
-        "find " + system_path + " -type f -exec file \"{}\" \\; | " +
-        "egrep \"ELF\\ |ARM,|\\.jar|\\.apk\" | grep -v \"\\.o:\" | " +
+        "find " + system_path + " -type f -exec file \"{}\" \\; | "
+        "egrep \"ELF\\ |ARM,|\\.jar|\\.apk\" | grep -v \"\\.o:\" | "
         "grep -v \"\\.odex:\" | awk -F\":\" \'{print $1}\'",
-        "find " + root_path + " -type f -exec file \"{}\" \\; | " +
+        "find " + root_path + " -type f -exec file \"{}\" \\; | "
         "egrep \"ELF\\ |ARM,|\\.jar|\\.apk\" | grep -v \"\\.o:\" | awk -F\":\" \'{print $1}\' ",
-        "find " + build_out_path + " -maxdepth 1 -type f -exec file \"{}\" \\; | grep data$ |" +
+        "find " + build_out_path + " -maxdepth 1 -type f -exec file \"{}\" \\; | grep data$ |"
         " grep -v .img  | awk -F\":\" \'{print $1}\' ",
         "find " + obj_static_lib + " -type f -exec file \"{}\" \\; | egrep \"ar archive\" | awk -F\":\" \'{print $1}\' ",
-        "find " + build_out_path + "  ! \\( \\( -type d -path " + system_path +
-        " -o -path " + root_path + " -o -path \'" + build_out_path +
-        "/obj*\' -o -path " + build_out_path + "/symbols -o -path \'" +
-        build_out_path + "/factory_*\' -o -path " + build_out_path +
-        "/dex_bootjars \\) -prune \\)  -type f -exec file \"{}\" \\; | egrep \"ELF\\ |ARM,|\\.jar|\\.apk\" | " +
+        f"find {build_out_path} ! \\( \\( -type d -path {system_path}"
+        f" -o -path {root_path} -o -path \'{build_out_path}"
+        f"/obj*\' -o -path {build_out_path}/symbols -o -path \'"
+        f"{build_out_path}/factory_*\' -o -path {build_out_path}"
+        "/dex_bootjars \\) -prune \\)  -type f -exec file \"{}\" \\; | egrep \"ELF\\ |ARM,|\\.jar|\\.apk\" | "
         "grep -v \"\\.o:\" | grep -v \"\\.odex:\" | awk -F\":\" \'{print $1}\' ",
         "find " + font_path + " -type f -exec file \"{}\" \\; | egrep \"font\" | awk -F\":\" \'{print $1}\'"
     ]
@@ -419,7 +419,7 @@ def filter_non_path_bin(FIND_DIRECTORY_MODE):
             pass
 
     if FIND_DIRECTORY_MODE:
-        get_path_by_using_find(need_to_find, build_out_path, "FIND_RESULT_OF_BINARIES"+now+".txt", python_script_dir)
+        get_path_by_using_find(need_to_find, build_out_path, f"FIND_RESULT_OF_BINARIES_{now}.txt", python_script_dir)
 
 
 def search_binaries_by_bin_name_and_checksum(bin_name_to_search, bin_checksum_to_search):
@@ -475,7 +475,7 @@ def get_repositories_name_from_web():
             pkg_list = soup.findAll("span", "RepoList-itemName")
 
             for pkg in pkg_list:
-                repositories[pkg.text] = url+pkg.text
+                repositories[pkg.text] = url + pkg.text
         except Exception:
             pass
 
@@ -606,7 +606,7 @@ def get_checksum_tlsh(bin_info_list, return_bin_list):
 
 def remove_duplicated_binaries_by_checking_checksum(remove_list_file):
     global final_bin_info
-    result_file_name = "REMOVED_BIN_BY_DUPLICATION_"+now+".txt"
+    result_file_name = f"REMOVED_BIN_BY_DUPLICATION_{now}.txt"
     str_bin_removed = ""
     filtered_binaries = []
     checked_file_name = {}
@@ -633,7 +633,7 @@ def remove_duplicated_binaries_by_checking_checksum(remove_list_file):
             cnt += 1
             print_removed_str, print_removed_array = item.get_print_items()
             for row_removed in print_removed_str:
-                str_bin_removed += row_removed+'\n'
+                str_bin_removed += f"{row_removed}\n"
             continue
         elif search_key not in checked_file_name:
             find_result, same_name_binaries = search_binaries_by_bin_name_and_checksum(bin_name_with_path,
@@ -677,7 +677,7 @@ def remove_duplicated_binaries_by_checking_checksum(remove_list_file):
                     if bin_same_name.bin_name != final_added.bin_name:
                         print_removed_str, print_removed_array = bin_same_name.get_print_items()
                         for row_removed in print_removed_str:
-                            str_bin_removed += row_removed+'\n'
+                            str_bin_removed += f"{row_removed}\n"
             else:  # Don't have any duplicated binaries
                 filtered_binaries.append(item)
     if remove_list_file != "":
diff --git a/src/fosslight_android/check_notice_file.py b/src/fosslight_android/check_notice_file.py
@@ -293,7 +293,7 @@ def create_license_txt_files(file_list, result_file_path):
                 os.makedirs(dir)
             write_txt_file(file_name, file['license_txt'], "")
     except Exception as error:
-        logger.warn("Error: Cannot create a notice file.:"+str(error))
+        logger.warn(f"Error: Cannot create a notice file.:{error}")
 
 
 def parsing_notice_html_for_license_text(notice_file_content):
