Comply with flake8

Author: soimkim

src/fosslight_android/_binary_db_controller.py

@@ -51,9 +51,9 @@ def get_oss_info_from_db(platform_version, bin_info_list, return_list):
                 bin_file_name = os.path.basename(bin_file)
                 # Get OSS Information From Binary DB by matching checksum , filename, tlsh
                 df_result, item_comment, is_new = get_oss_info_by_tlsh_and_filename(bin_file_name,
-                                                                            checksum_value, tlsh_value,
-                                                                            item.source_code_path,
-                                                                            platform_version, conn, cur)
+                                                                                    checksum_value, tlsh_value,
+                                                                                    item.source_code_path,
+                                                                                    platform_version, conn, cur)
                 item.set_comment(item_comment)
                 item.is_new_bin = is_new
                 if df_result is not None and len(df_result) > 0:

src/fosslight_android/_common.py

@@ -60,7 +60,6 @@ def __init__(self, value):
         self.additional_oss_items = []
         self.is_new_bin = True
 
-
     def __del__(self):
         pass
 

src/fosslight_android/_help.py

@@ -8,13 +8,13 @@
     Usage: fosslight_android [option1] <arg1> [option2] <arg2>...
 
     List all the binaries loaded on the Android-based model to check which open source is used for each
-    binary, and to check whether the notices are included in the OSS notice. 
+    binary, and to check whether the notices are included in the OSS notice.
     (ex-NOTICE.html: OSS Notice for Android-based model).
 
     Options:
         Mandatory
             -s <android_source_path>\t   Path to analyze
-            -a <build_log_file_name>\t   The file must be located in the android source path. 
+            -a <build_log_file_name>\t   The file must be located in the android source path.
 
         Optional
             -h\t\t\t\t   Print help message
@@ -34,4 +34,3 @@ def print_help_msg():
 
 def print_version(pkg_name):
     print_package_version(pkg_name, "FOSSLight Android Version:")
-

src/fosslight_android/_src_analysis.py

@@ -72,4 +72,4 @@ def run_src_analysis(scan_input_path, start_time="", output_dir=""):
                 logger.debug(f"Failed to analysis (scan) {scan_input_path}:{result_log}")
         except Exception as error:
             logger.debug(f"Failed to analysis {scan_input_path}:{error}")
-    return license
+    return license

src/fosslight_android/_write_excel.py

@@ -45,7 +45,7 @@ def create_worksheet(workbook, sheet_name, header_row):
 def write_result_to_txt_and_excel(out_excel_file, final_bin_info, out_txt_file):
     excel_list = []
     final_str = ['Binary Name\tSource Code Path\tNOTICE.html\tOSS Name\tOSS Version\tLicense\tNeed '
-                'Check\tComment\ttlsh\tchecksum']
+                 'Check\tComment\ttlsh\tchecksum']
     if final_bin_info:
         for item in sorted(final_bin_info, key=lambda binary: (binary.source_code_path, binary.bin_name)):
             try:
@@ -60,5 +60,3 @@ def write_result_to_txt_and_excel(out_excel_file, final_bin_info, out_txt_file):
         write_result_to_excel(out_excel_file, excel_list)
     else:
         logger.warning("Nothing is detected from the scanner so output file is not generated.")
-
-

src/fosslight_android/android_binary_analysis.py

@@ -9,7 +9,6 @@
 import os
 import re
 import json
-import getopt
 import logging
 # Parsing NOTICE
 from bs4 import BeautifulSoup
@@ -54,7 +53,6 @@
 from fosslight_util.constant import LOGGER_NAME
 from fosslight_binary.binary_analysis import return_bin_only
 import argparse
-import glob
 from pathlib import Path
 
 EXCEPTIONAL_PATH = [r"(/)+gen/META/lic_intermediates/"]
@@ -141,15 +139,15 @@ def get_module_json_obj_by_installed_path(module_name, binary_name_with_path, bi
 
     js_value = ""
 
-    if module_name in module_info_json_obj: # Binary Name without extension
+    if module_name in module_info_json_obj:  # Binary Name without extension
         js_value = module_info_json_obj[module_name]
         js_value[MODULE_TYPE_NAME] = module_name
         return js_value
-    elif binary_name_only in module_info_json_obj: # Binary Name
+    elif binary_name_only in module_info_json_obj:  # Binary Name
         js_value = module_info_json_obj[binary_name_only]
         js_value[MODULE_TYPE_NAME] = binary_name_only
         return js_value
-    else: # Find binary by installed path
+    else:  # Find binary by installed path
         for key in module_info_json_obj:
             js_value = module_info_json_obj[key]
             output_files = js_value["installed"]
@@ -330,7 +328,7 @@ def find_notice_value():
     global notice_file_list, final_bin_info
 
     try:
-        notice_file_list, notice_files= read_notice_file(os.path.abspath(build_out_notice_file_path), NOTICE_HTML_FILE_NAME)
+        notice_file_list, notice_files = read_notice_file(os.path.abspath(build_out_notice_file_path), NOTICE_HTML_FILE_NAME)
         if not notice_file_list:
             logger.info(f"Notice file is empty:{notice_files}")
             return
@@ -341,7 +339,7 @@ def find_notice_value():
         return_list = do_multi_process(find_notice_html, final_bin_info)
         final_bin_info = return_list[:]
 
-    except IOError as error: # 'CANNOT_FIND_NOTICE_HTML'
+    except IOError as error:  # 'CANNOT_FIND_NOTICE_HTML'
         logger.debug(f"find_notice_value:{error}")
 
 
@@ -643,7 +641,7 @@ def remove_duplicated_binaries_by_checking_checksum(remove_list_file):
             checked_file_name[search_key] = find_result
 
             if find_result:
-                final_added = "" # finally added binary
+                final_added = ""  # finally added binary
                 # 0 : file in system folder, 1: Source Path exists, 2:exist in NOTICE.html, 3: shortest path
                 priority = ["", "", "", ""]
                 idx_notice = 2
@@ -764,8 +762,6 @@ def main():
     _NOTICE_CHECKLIST_TYPE = False
     analyze_source = False
 
-    argv = sys.argv[1:]
-
     num_cores = multiprocessing.cpu_count() - 1
     if num_cores < 1:
         num_cores = 1
@@ -786,7 +782,7 @@ def main():
     parser.add_argument('-n', '--notice', type=str, required=False)
     parser.add_argument('-t', '--toadd', action='store_true', required=False)
     parser.add_argument('-m', '--more', action='store_true', required=False)
-    parser.add_argument('-c', '--check',type=str, required=False)
+    parser.add_argument('-c', '--check', type=str, required=False)
     parser.add_argument('-a', '--android', type=str, required=False)
     parser.add_argument('-f', '--find', action='store_true', required=False)
     parser.add_argument('-i', '--ignore', action='store_true', required=False)
@@ -799,9 +795,9 @@ def main():
         print_help_msg()
     if args.version:
         print_version(PKG_NAME)
-    if args.source: # android source path
+    if args.source:  # android source path
         os.chdir(args.source)
-    if args.binary: # Base model's binary.txt to exclude
+    if args.binary:  # Base model's binary.txt to exclude
         base_binary_txt = args.binary
     if args.notice:
         NOTICE_HTML_FILE_NAME = args.notice

src/fosslight_android/check_notice_file.py

@@ -46,11 +46,9 @@ def run_notice_html_checklist(binary_file, check_type, notice_file):
 
 def find_bin_in_notice(binary_file_name, notice_file_list):
     notice_found = False
-    notice_matched = ""
     if binary_file_name:
         if binary_file_name in notice_file_list:
             notice_found = True
-            notice_matched = binary_file_name
         else:
             apex_name_search_list = []
             try:
@@ -59,15 +57,15 @@ def find_bin_in_notice(binary_file_name, notice_file_list):
                 if m:
                     apex_name = m.group(1)
                 if apex_name:
-                    apex_name_search_list = [f"{apex_name}.apex", f"{apex_name}.capex", f"{apex_name}_compressed.apex", f"{apex_name}-uncompressed.apex"]
+                    apex_name_search_list = [f"{apex_name}.apex", f"{apex_name}.capex",
+                                             f"{apex_name}_compressed.apex", f"{apex_name}-uncompressed.apex"]
             except Exception as error:
-                pass
+                logger.debug(f"find_bin_in_notice :{error}")
             binary_without_path = os.path.basename(binary_file_name)
             for key in notice_file_list:
                 key_file_name = os.path.basename(key)
                 if key_file_name == binary_without_path or any(apex_name == key_file_name for apex_name in apex_name_search_list):
                     notice_found = True
-                    notice_matched = key_file_name
                     break
 
     return notice_found