fix: close script file handles with context managers (#2153)

Signed-off-by: Acuspeedster <arnavrajsingh@gmail.com>
Co-authored-by: Lou DeGenaro <lou.degenaro@gmail.com>

Author: Acuspeedster

scripts/schema_integrity.py

@@ -41,9 +41,8 @@ def _run(self, args: argparse.Namespace) -> int:
             dir_of_schemas = pathlib.Path(args.directory)
             for path_of_schema in dir_of_schemas.glob('oscal_*_schema.json'):
                 self.out(f'Examinining: {path_of_schema.name}')
-                fp = path_of_schema.open('r', encoding='utf8')
-                json_schema_raw = json.load(fp)
-                fp.close()
+                with path_of_schema.open('r', encoding='utf8') as fp:
+                    json_schema_raw = json.load(fp)
                 # get list of ID's
                 # Cannot use this technique using latest OSCAL code drop
                 # ids = list(set(self.recursive_ref('$id', json_schema_raw))) # noqa: E800

scripts/tanium_transform_script.py

@@ -27,7 +27,8 @@
 sample_data_f = pathlib.Path('small_sample_tanium.json')
 
 if __name__ == '__main__':
-    stringed = sample_data_f.open('r', encoding=const.FILE_ENCODING).read()
+    with sample_data_f.open('r', encoding=const.FILE_ENCODING) as f:
+        stringed = f.read()
     tanium_tf = transformer_factory.get('tanium')
     output_oscal = tanium_tf.transform(stringed)
     json_str = output_oscal.oscal_serialize_json()

scripts/utf8me.py

@@ -48,15 +48,10 @@ def _run(self, args: argparse.Namespace) -> int:
         input_path = pathlib.Path(args.input[0])
         if not input_path.is_file():
             logger.error('Input file does not exist or is a directory.')
-        fh = codecs.open(str(input_path.resolve()), mode='r', encoding='utf8', errors='replace')
-        content = fh.read()
-        # Force flushing incase we are writing over the file)
-        fh.flush()
-        fh.close()
-        output_file = pathlib.Path(outfile).resolve().open('w', encoding='utf8')
-        output_file.write(content)
-        output_file.flush()
-        output_file.close()
+        with codecs.open(str(input_path.resolve()), mode='r', encoding='utf8', errors='replace') as fh:
+            content = fh.read()
+        with pathlib.Path(outfile).resolve().open('w', encoding='utf8') as output_file:
+            output_file.write(content)
         return CmdReturnCodes.SUCCESS.value
 
 

scripts/website_automation.py

@@ -33,15 +33,14 @@ def write_module_doc_metafile(dump_location: pathlib.Path, module_name: str) ->
     """Create a markdown file which allows mkdocstrings to index an individual module."""
     write_file = dump_location / (module_name.replace('.', '/') + '.md')
     write_file.parent.mkdir(parents=True, exist_ok=True)
-    fh = write_file.open('w', encoding='utf8')
-    # yaml header
-    fh.write('---\n')
-    fh.write(f'title: {module_name}\n')
-    fh.write(f'description: Documentation for {module_name} module\n')
-    fh.write('---\n\n')
-    fh.write(f'::: {module_name}\n')  # noqa: E231
-    fh.write('handler: python\n')
-    fh.close()
+    with write_file.open('w', encoding='utf8') as fh:
+        # yaml header
+        fh.write('---\n')
+        fh.write(f'title: {module_name}\n')
+        fh.write(f'description: Documentation for {module_name} module\n')
+        fh.write('---\n\n')
+        fh.write(f'::: {module_name}\n')  # noqa: E231
+        fh.write('handler: python\n')
 
 
 def get_key(var: Dict[str, Any]) -> str:
@@ -72,11 +71,12 @@ def create_module_markdowns(base_path: pathlib.Path, base_module: str, dump_loca
 def md_txt(original: pathlib.Path, md_ed_license: pathlib.Path):
     """Convert the apache license into a markdown file by wrapping the content in a text escape block."""
     assert original.exists()
-    orig_data = original.open('r', encoding='utf8').read()
-    md_fh = md_ed_license.open('w', encoding='utf8')
-    md_fh.write('```text\n')
-    md_fh.write(orig_data)
-    md_fh.write('\n```\n')
+    with original.open('r', encoding='utf8') as orig_fh:
+        orig_data = orig_fh.read()
+    with md_ed_license.open('w', encoding='utf8') as md_fh:
+        md_fh.write('```text\n')
+        md_fh.write(orig_data)
+        md_fh.write('\n```\n')
 
 
 def cleanup_directory(dump_location: pathlib.Path):