commit 17069628a7f28198652a296ac16dc83529c7eaae
author Richard Burton <richard.burton@arm.com> Thu Mar 17 10:54:26 2022 +0000
committer Richard <richard.burton@arm.com> Thu Mar 17 15:19:16 2022 +0000
tree adff78b64954e67dc4e29f6f039c63c8c18cde2c
parent 624dafd2a206d88da979453442fe5a8d4c05ad51

MLECO-3036: Update to use Pathlib in Python scripts

* Pathlib used in Python scripts over os
* Bug fix for build_default.py
* Minor code style updates
 
Signed-off-by: Richard Burton <richard.burton@arm.com>
Change-Id: I5fc2e582a84443c3fb79250eb711b960d63ed8fd

scripts/py/gen_labels_cpp.py

diff --git a/scripts/py/gen_labels_cpp.py b/scripts/py/gen_labels_cpp.py
index 1be9c63..25c4bc3 100644
--- a/scripts/py/gen_labels_cpp.py
+++ b/scripts/py/gen_labels_cpp.py
@@ -22,8 +22,9 @@
 cpp file with labels that can be used in the application without modification.
 """
 import datetime
-import os
+from pathlib import Path
 from argparse import ArgumentParser
+
 from jinja2 import Environment, FileSystemLoader
 
 parser = ArgumentParser()
@@ -42,7 +43,7 @@
 
 args = parser.parse_args()
 
-env = Environment(loader=FileSystemLoader(os.path.join(os.path.dirname(__file__), 'templates')),
+env = Environment(loader=FileSystemLoader(Path(__file__).parent / 'templates'),
                   trim_blocks=True,
                   lstrip_blocks=True)
 
@@ -57,19 +58,18 @@
         raise Exception(f"no labels found in {args.label_file}")
 
     header_template = env.get_template(args.license_template)
-    hdr = header_template.render(script_name=os.path.basename(__file__),
+    hdr = header_template.render(script_name=Path(__file__).name,
                                  gen_time=datetime.datetime.now(),
-                                 file_name=os.path.basename(args.labels_file),
+                                 file_name=Path(args.labels_file).name,
                                  year=datetime.datetime.now().year)
 
-    hpp_filename = os.path.join(args.header_folder_path, args.output_file_name + ".hpp")
+    hpp_filename = Path(args.header_folder_path) / (args.output_file_name + ".hpp")
     env.get_template('Labels.hpp.template').stream(common_template_header=hdr,
-                                                   filename=(args.output_file_name).upper(),
+                                                   filename=args.output_file_name.upper(),
                                                    namespaces=args.namespaces) \
         .dump(str(hpp_filename))
 
-
-    cc_filename = os.path.join(args.source_folder_path, args.output_file_name + ".cc")
+    cc_filename = Path(args.source_folder_path) / (args.output_file_name + ".cc")
     env.get_template('Labels.cc.template').stream(common_template_header=hdr,
                                                   labels=labels,
                                                   labelsSize=len(labels),