dd

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

src/util/convert-help.py

@@ -286,20 +286,9 @@ def purge(parsed_data, citations):
 def generate_c_code(parsed_data):
     # Generate C code with an array of filenames and their
     # corresponding INI sections.
-    c_code = f"""// THIS FILE IS GENERATED AUTOMATICALLY! EDITS WILL BE LOST!
-// This file generated by {os.path.basename(sys.argv[0])}
+    c_code = "// THIS FILE IS GENERATED AUTOMATICALLY! EDITS WILL BE LOST!\n// This file generated by " + os.path.basename(sys.argv[0]) + "\n\n"
 
-"""
-    # Rather than escaping the C code {} in f strings, make this a
-    # separate (non-f-string) addition to c_code.
-    c_code += """#include "src/include/pmix_config.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include "src/include/pmix_globals.h"
-
-"""
+    c_code += "#include \"src/include/pmix_config.h\"\n#include <stdio.h>\n#include <string.h>\n\n#include \"src/include/pmix_globals.h\"\n\n"
 
     ini_arrays = []
     file_entries = []
@@ -309,18 +298,18 @@ def generate_c_code(parsed_data):
 
         ini_entries = []
         for section, content_list in sections.items():
-            entry = f'    {{ .topic = "{section}",\n      .content = (const char *[]){{\n'
+            entry = "    { .topic = \"" + section + "\",\n      .content = (const char *[]){\n"
             for content in content_list:
                 c_content = content.replace('"','\\"').replace("\n", '\\n"\n"').replace("\\;", ";")
-                entry += f'                 \"{c_content}\",\n'
-            entry += f'                 NULL}}\n    }},\n'
+                entry += "                 \"" + c_content + "\",\n"
+            entry += "                 NULL}\n    },\n"
             ini_entries.append(entry)
-        ini_entries.append(f'    {{ .topic = NULL, .content = NULL }}')
+        ini_entries.append("    { .topic = NULL, .content = NULL }")
 
-        ini_array_name = f"ini_entries_{idx}"
-        ini_arrays.append(f"static pmix_show_help_entry_t {ini_array_name}[] = {{\n" + "\n".join(ini_entries) + "\n};\n")
-        file_entries.append(f'    {{ "{filename}", {ini_array_name} }}')
-    file_entries.append(f'    {{ NULL, NULL }}')
+        ini_array_name = "ini_entries_" + str(idx)
+        ini_arrays.append("static pmix_show_help_entry_t " + ini_array_name + "[] = {\n" + "\n".join(ini_entries) + "\n};\n")
+        file_entries.append("    { \"" + filename + "\", " + ini_array_name + "}")
+    file_entries.append("    { NULL, NULL }")
 
     c_code += "\n".join(ini_arrays) + "\n"
     c_code += "pmix_show_help_file_t pmix_show_help_data[] = {\n" + ",\n".join(file_entries) + "\n};\n"