touching up format_arg super handling

Author: tclose

nipype2pydra/interface/base.py

@@ -1300,7 +1300,7 @@ def replace_super(match):
                         for m in UsedSymbols.ALWAYS_OMIT_MODULES
                     ):
                         raise KeyError(
-                            f"Require special mapping for {match.group(1)} in {base} class "
+                            f"Require special mapping for '{match.group(1)}' in {base} class "
                             "as methods in that module are being omitted from the conversion"
                         ) from None
                     raise
@@ -1365,7 +1365,10 @@ def unwrap_nested_methods(self, method_body, additional_args=()):
         )
         return cleanup_function_body(method_body)
 
-    SPECIAL_SUPER_MAPPINGS = {CommandLine._list_outputs: "{}"}
+    SPECIAL_SUPER_MAPPINGS = {
+        CommandLine._list_outputs: "{}",
+        CommandLine._format_arg: "argstr.format(**inputs)",
+    }
 
     INPUT_KEYS = [
         "allowed_values",

nipype2pydra/interface/shell_command.py

@@ -296,7 +296,6 @@ def format_arg_code(self):
     if {val_arg} is None:
         return ""
 {body}
-    return argstr.format(**inputs)
 
 
 """
@@ -358,7 +357,7 @@ def defaults_code(self):
 
         code_str = f"""def _gen_filename(name, inputs):
     parsed_inputs = _parse_inputs(inputs) if inputs else {{}}
-    {body}
+{body}
 """
         # Create separate default function for each input field with genfile, which
         # reference the magic "_gen_filename" method