Removed fstrings

Author: Evan8456

reproschema/cli.py

@@ -264,9 +264,9 @@ def reproschema_to_fhir(reproschema_questionnaire, output):
         ][0]
         reproschema_schema = reproschema_content[schema_name]
 
-        if (f"schema:version" in reproschema_schema and
+        if ("schema:version" in reproschema_schema and
                 reproschema_schema["schema:version"] not in ("0.0.1", "1.0.0-rc1", "1.0.0")
-            ) or f"schemaVersion" in reproschema_schema and reproschema_schema[
+            ) or "schemaVersion" in reproschema_schema and reproschema_schema[
                 "schemaVersion"] not in ("0.0.1", "1.0.0-rc1", "1.0.0-rc4", "1.0.0"):
             raise ValueError(
                 'Unable to work with reproschema versions other than 0.0.1, 1.0.0-rc1, and 1.0.0-rc4'
@@ -278,15 +278,15 @@ def reproschema_to_fhir(reproschema_questionnaire, output):
 
         # validate the json using fhir resources
         try:
-            questionnaire_json = Questionnaire.model_validate(fhir_questionnaire)
+            Questionnaire.model_validate(fhir_questionnaire)
         except Exception:
             raise Exception("Fhir Questionnaire is not valid")
 
         # get filename from the reproschema_folder name provided
 
         file_name = reproschema_folder.parts[-1]
 
-        dirpath = Path(output_path / f"{file_name}")
+        dirpath = Path(output_path / file_name)
         if dirpath.exists() and dirpath.is_dir():
             shutil.rmtree(dirpath)
 

reproschema/reproschema2fhir.py

@@ -57,11 +57,11 @@ def add_options(options_json) -> list:
     Helper function to extract all answer choices to a list
     """
     options = []
-    for j in options_json[f"choices"]:
+    for j in options_json["choices"]:
         if "schema:name" in j and j["schema:name"] != "":
             choice = j["schema:name"]
         elif "name" in j and j["name"] != "":
-            choice = j[f"name"]
+            choice = j["name"]
             if "en" in j["name"] and isinstance(["name"], dict):
                 choice = choice["en"]
             else:
@@ -161,10 +161,10 @@ def parse_reproschema_items(self, reproschema_items: OrderedDict,
                 curr_item["text"] = preamble + str(
                     item_json["question"]["en"])
 
-            elif f"prefLabel" in item_json:
+            elif "prefLabel" in item_json:
                 curr_item["text"] = str(item_json["prefLabel"])
             else:
-                curr_item[f"text"] = curr_item[f"linkId"]
+                curr_item["text"] = curr_item["linkId"]
 
             id_str: str = var_name
             id_str = id_str.replace("_", "-")
@@ -200,7 +200,7 @@ def parse_reproschema_items(self, reproschema_items: OrderedDict,
                         if "valueType" in item_json[
                                 "responseOptions"] and "int" in item_json[
                                     "responseOptions"]["valueType"]:
-                            curr_item[f"type"] = f"integer"
+                            curr_item["type"] = "integer"
                         elif "valueType" in item_json[
                                 "responseOptions"] and "date" in item_json[
                                     "responseOptions"]["valueType"]:
@@ -283,7 +283,7 @@ def convert_to_fhir(self, reproschema_content: dict):
         ])
 
         question_order = [("items/" + sub.replace("items/", ""))
-                          for sub in reproschema_schema[f"ui"][f"order"]]
+                          for sub in reproschema_schema["ui"]["order"]]
 
         reproschema_items = OrderedDict(
             (key, reproschema_items[key]) for key in question_order)