Use to close file handles

Author: cclauss

build_parameters.py

@@ -213,12 +213,10 @@ def handle_starttag(self, tag, attrs):
         page_links = fetch_vehicle_subfolders(firmware_url + f)
         for folder in page_links:  # Non clever way to filter the strings insert by makehtml.py, unwanted folders, and so.
             version_folder = str(folder)
-            if version_folder.find("stable") > 0 and not version_folder.endswith("stable"): # If finish with
-                stableFirmwares.append(firmware_url[:-1] + version_folder[10:-2])
-            elif version_folder.find("latest") > 0 :
-                stableFirmwares.append(firmware_url[:-1] + version_folder[10:-2])
-            elif version_folder.find("beta") > 0:
+            if "stable" in version_folder and not version_folder.endswith("stable"): # If finish with
                 stableFirmwares.append(firmware_url[:-1] + version_folder[10:-2])
+            elif "beta" in version_folder or "latest" in version_folder:
+                stableFirmwares.append(firmware_url[:-1] + version_folder[10:-2])  # noqa: SIM114
 
     return stableFirmwares # links for the firmwares folders
 
@@ -350,8 +348,8 @@ def replace_anchors(source_file, dest_file, version_tag):
         For each parameter file generate by param_parse.py, it inserts a version tag in anchors
         to do not make confusing in sphinx toctrees.
         """
-        file_in = open(source_file, "r")
-        file_out = open(dest_file, "w")
+        file_in = open(source_file, "r")  # noqa: SIM115
+        file_out = open(dest_file, "w")  # noqa: SIM115
         found_original_title = False
         if "latest" not in version_tag:
             file_out.write(':orphan:\n\n')
@@ -414,10 +412,8 @@ def replace_anchors(source_file, dest_file, version_tag):
 
             # create a filename for new parameters file
             filename = "parameters-" + vehicle
-            if ("beta" in version or "rc" in version): # Plane uses BETA, Copter and Rover uses RCn
+            if "latest" in version or "beta" in version or "rc" in version: # Plane uses BETA, Copter and Rover uses RCn
                 filename += "-" + version  + ".rst"
-            elif ("latest" in version):
-                filename += "-" + version + ".rst"
             else:
                 filename += "-stable-" + version + ".rst"
 

pyproject.toml

@@ -9,6 +9,7 @@ line-length = 127
 lint.extend-select = [
   "FURB",   # refurb
   "Q003",   # avoidable-escaped-quote
+  "SIM",    # flake8-simplify
   "UP031",  # printf-string-formatting
   "UP032",  # f-string
 ]

rst_table.py

@@ -19,15 +19,13 @@ def tablify_row(rowheading, row, widths, height):
             rowheading_line = rowheading_lines[i]
             out_line += joiner + " " + rowheading_line + " " * (widths[0] - len(rowheading_line) - 1)
             joiner = "#"
-        j = 0
-        for item in row_lines:
+        for j, item in enumerate(row_lines):
             widthnum = j
             if rowheading is not None:
                 widthnum += 1
             line = item[i]
             out_line += joiner + " " + line + " " * (widths[widthnum] - len(line) - 1)
             joiner = "|"
-            j += 1
         out_line += "|"
         out_lines.append(out_line)
     return "\n".join(out_lines)
@@ -77,16 +75,14 @@ def tablify_calc_row_widths_heights(rows, rowheadings, headings):
         if rowheadings is not None:
             values_to_check.append(all_rowheadings[rownum])
         values_to_check.extend(row[:])
-        colnum = 0
-        for value in values_to_check:
+        for colnum, value in enumerate(values_to_check):
             height = len(value.split("\n"))
             if height > heights[rownum]:
                 heights[rownum] = height
             longest_line = longest_line_in_string(value)
             width = longest_line + 2  # +2 for leading/trailing ws
             if width > widths[colnum]:
                 widths[colnum] = width
-            colnum += 1
     return (widths, heights)
 
 

scripts/build_motor_diagrams.py

@@ -361,9 +361,7 @@ def handle_av_tails(layout, motor_element, number_element, letter_element, x, y)
         return
     x_scale = -1 if x < 0 and "v" not in layout["TypeName"].lower() else 1
     y_scale = -1
-    if x < 0 and "v" in layout["TypeName"].lower():
-        y_scale = 1
-    elif "v" not in layout["TypeName"].lower():
+    if x < 0 and "v" in layout["TypeName"].lower() or "v" not in layout["TypeName"].lower():
         y_scale = 1
     motor_element.set("style", f"transform: rotate3d({x_scale}, {y_scale}, 0, 45deg)")
     number_element.set("style", f"transform: rotate3d({x_scale}, {y_scale}, 0, 45deg)")

scripts/cap_params.py

@@ -14,7 +14,8 @@
 
 for f in args.files:
     print(f"Processing {f}")
-    txt = open(f, 'r').read()
+    with open(f) as in_file:
+        txt = in_file.read()
     matches = re.findall(r'[,.\s][A-Z][A-Z0-9]+_[A-Z_]+[,.\s]', txt)
     matches = re.findall(r'[,.\s][A-Z]+_[A-Z_]+[,.\s]', txt)
     changed = False
@@ -29,4 +30,5 @@
         else:
             print(f"Found [{s}]")
     if changed:
-        open(f, 'w').write(txt)
+        with open(f, 'w') as out_file:
+            out_file.write(txt)

scripts/rename_params.py

@@ -25,7 +25,8 @@
 
 
 def load_param_map(fname):
-    lines = open(fname, 'r').readlines()
+    with open(fname) as in_file:
+        lines = in_file.readlines()
     ret = {}
     for line in lines:
         if line.startswith("#"):
@@ -47,14 +48,15 @@ def process_file(fname, param_map):
             print(f"Skipping common file {fname}")
         return
     needs_write = False
-    txt = open(fname, "r").read()
+    with open(fname) as in_file:
+        txt = in_file.read()
 
     replacements = [":ref:`PARAMNAME <PARAMNAME>`",
                     ":ref:`PARAMNAME<PARAMNAME>`"]
     if args.nonref:
         replacements.extend(["PARAMNAME"])
 
-    for old_name in param_map.keys():
+    for old_name in param_map:
         new_name = param_map[old_name]
         for r in replacements:
             p1 = r.replace("PARAMNAME", old_name)
@@ -65,7 +67,8 @@ def process_file(fname, param_map):
     if not needs_write:
         return
     print(f"Updating {fname}")
-    open(fname, "w").write(txt)
+    with open(fname, "w") as out_file:
+        out_file.write(txt)
 
 
 param_map = load_param_map(args.param_map)

update.py

@@ -287,7 +287,7 @@ def sphinx_make(site, parallel, fast):
             continue
         if wiki == 'frontend':
             continue
-        if site is not None and not site == wiki:
+        if site is not None and site != wiki:
             continue
         p = multiprocessing.Process(target=build_one, args=(wiki, fast))
         p.start()
@@ -479,9 +479,8 @@ def copy_common_source_files(start_dir=COMMON_DIR, clean_common=False):
             if file.endswith(".rst"):
                 # debug("  FILE: %s" % file)
                 source_file_path = os.path.join(root, file)
-                source_file = open(source_file_path, 'r', encoding='utf-8')
-                source_content = source_file.read()
-                source_file.close()
+                with open(source_file_path, encoding='utf-8') as source_file:
+                    source_content = source_file.read()
                 targets = get_copy_targets(source_content)
                 for wiki in targets:
                     content = strip_content(source_content, wiki)
@@ -512,9 +511,8 @@ def copy_common_source_files(start_dir=COMMON_DIR, clean_common=False):
                     shutil.copy2(src, dst)
             elif file.endswith(".js"):
                 source_file_path = os.path.join(root, file)
-                source_file = open(source_file_path, 'r', encoding='utf-8')
-                source_content = source_file.read()
-                source_file.close()
+                with open(source_file_path, encoding='utf-8') as source_file:
+                    source_content = source_file.read()
                 targets = get_copy_targets(source_content)
                 for wiki in targets:
                     content = strip_content(source_content, wiki)
@@ -885,14 +883,15 @@ def create_features_pages(site):
     # fetch and load most-recently-built features.json
     remove_if_exists("features.json.gz")
     fetch_url("https://firmware.ardupilot.org/features.json.gz")
-    features_json = json.load(gzip.open("features.json.gz"))
+    with gzip.open("features.json.gz") as in_file:
+        features_json = json.load(in_file)
     if features_json["format-version"] != "1.0.0":
         progress("bad format version")
         return
     features = features_json["features"]
 
     # progress("features: (%s)" % str(features))
-    for wiki in WIKI_NAME_TO_VEHICLE_NAME.keys():
+    for wiki in WIKI_NAME_TO_VEHICLE_NAME:
         debug(wiki)
         if site is not None and site != wiki:
             continue
@@ -943,10 +942,7 @@ def create_features_page(features, build_options_by_define, vehicletype):
                 # mismatch between build_options.py and features.json
                 progress(f"feature {feature} ({platform_key},{vehicletype}) not in build_options.py")
                 continue
-            if feature_in:
-                some_list = sorted_platform_features_in
-            else:
-                some_list = sorted_platform_features_not_in
+            some_list = sorted_platform_features_in if feature_in else sorted_platform_features_not_in
             some_list.append((build_options.category, feature))
 
         sorted_platform_features = (
@@ -965,10 +961,7 @@ def create_features_page(features, build_options_by_define, vehicletype):
                 # for now, do not include features that are on the
                 # board, just those that aren't, per Henry's request:
                 rows.append(row)
-        if len(rows) == 0:
-            t = ""
-        else:
-            t = rst_table.tablify(rows, headings=column_headings)
+        t = rst_table.tablify(rows, headings=column_headings) if rows else ""
         underline = "-" * len(platform_key)
         all_tables += (f'''
 .. _{reference_for_board(platform_key)}: