From 53ccc63bc241c3a902e7d5c114fcf85d5ae178cf Mon Sep 17 00:00:00 2001
From: Thibault <70470823+ThibFrgsGmz@users.noreply.github.com>
Date: Tue, 25 Apr 2023 04:38:22 +1200
Subject: [PATCH] Replace one `if` statement w/ `if` expr (#129)

* (feat): f-string formatting

* (feat) replace if stat. w/ if expr.
---
 src/fprime/fpp/common.py                | 2 +-
 src/fprime/util/cli.py                  | 5 +----
 src/fprime/util/code_formatter.py       | 2 +-
 src/fprime/util/cookiecutter_wrapper.py | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/fprime/fpp/common.py b/src/fprime/fpp/common.py
index 1cc9fa7a..c453507a 100644
--- a/src/fprime/fpp/common.py
+++ b/src/fprime/fpp/common.py
@@ -19,7 +19,7 @@ class FppMissingSupportFiles(FprimeException):
 
     def __init__(self, file):
         super().__init__(
-            f"Current directory does not define any FPP files. Did you intend to run in the topology directory?"
+            "Current directory does not define any FPP files. Did you intend to run in the topology directory?"
         )
 
 
diff --git a/src/fprime/util/cli.py b/src/fprime/util/cli.py
index b6ba32ed..b44078d1 100644
--- a/src/fprime/util/cli.py
+++ b/src/fprime/util/cli.py
@@ -28,10 +28,7 @@ def utility_entry(args):
     parsed, cmake_args, make_args, parser, runners = parse_args(args)
 
     try:
-        if skip_build_loading(parsed):
-            build = None
-        else:
-            build = load_build(parsed)
+        build = None if skip_build_loading(parsed) else load_build(parsed)
 
         # runners is a Dict[str, Callable] of {command_name: handler_functions} pairs
         return runners[parsed.command](
diff --git a/src/fprime/util/code_formatter.py b/src/fprime/util/code_formatter.py
index b1e93234..3f7c8129 100644
--- a/src/fprime/util/code_formatter.py
+++ b/src/fprime/util/code_formatter.py
@@ -139,7 +139,7 @@ def execute(
         # Backup files unless --no-backup is requested
         if self.backup:
             for file in self._files_to_format:
-                shutil.copy2(file, file.parent / (file.stem + ".bak" + file.suffix))
+                shutil.copy2(file, file.parent / f"{file.stem}.bak{file.suffix}")
         pass_through = args[1]
         self._preprocess_files()
         clang_args = [
diff --git a/src/fprime/util/cookiecutter_wrapper.py b/src/fprime/util/cookiecutter_wrapper.py
index b5cbdf99..00ed34a6 100644
--- a/src/fprime/util/cookiecutter_wrapper.py
+++ b/src/fprime/util/cookiecutter_wrapper.py
@@ -38,7 +38,7 @@ def run_impl(build: Build, source_path: Path):
     hpp_dest = hpp_files[0]
     cpp_dest = common[0] if common else cpp_files[0]
 
-    if not confirm(f"Generate implementation files (yes/no)? "):
+    if not confirm("Generate implementation files (yes/no)? "):
         return False
     print(
         "Refreshing cache and generating implementation files (ignore 'Stop' CMake warning)..."
@@ -320,7 +320,7 @@ def get_valid_input(prompt):
         name = input(prompt)
         char = is_valid_name(name)
         if char != "valid":
-            print("'" + char + "' is not a valid character")
+            print(f"'{char}' is not a valid character")
         else:
             valid_name = True
     return name
@@ -467,7 +467,7 @@ def new_deployment(parsed_args):
         os.path.dirname(__file__)
         + "/../cookiecutter_templates/cookiecutter-fprime-deployment"
     )
-    print(f"[INFO] Cookiecutter: using builtin template for new deployment")
+    print("[INFO] Cookiecutter: using builtin template for new deployment")
     try:
         gen_path = cookiecutter(source, overwrite_if_exists=parsed_args.overwrite)
     except OutputDirExistsException as out_directory_error: