Fix config and psconvert

Author: seisman

pygmt/figure.py

@@ -18,7 +18,7 @@
 from pygmt.clib import Session
 from pygmt.exceptions import GMTError, GMTInvalidInput
 from pygmt.helpers import (
-    build_arg_string,
+    build_arg_list,
     fmt_docstring,
     kwargs_to_strings,
     launch_external_viewer,
@@ -234,15 +234,12 @@ def psconvert(self, **kwargs):
         # Default cropping the figure to True
         if kwargs.get("A") is None:
             kwargs["A"] = ""
-        # Manually handle prefix -F argument so spaces aren't converted to \040
-        # by build_arg_string function. For more information, see
-        # https://github.com/GenericMappingTools/pygmt/pull/1487
-        prefix = kwargs.pop("F", None)
+
+        prefix = kwargs.get("F")
         if prefix in ["", None, False, True]:
             raise GMTInvalidInput(
                 "The 'prefix' parameter must be specified with a valid value."
             )
-        prefix_arg = f'-F"{prefix}"'
 
         # check if the parent directory exists
         prefix_path = Path(prefix).parent
@@ -252,9 +249,7 @@ def psconvert(self, **kwargs):
             )
 
         with Session() as lib:
-            lib.call_module(
-                module="psconvert", args=f"{prefix_arg} {build_arg_string(kwargs)}"
-            )
+            lib.call_module(module="psconvert", args=build_arg_list(kwargs))
 
     def savefig(  # noqa: PLR0912
         self,

pygmt/src/config.py

@@ -199,9 +199,10 @@ def __init__(self, **kwargs):
                     self.old_defaults[key] = lib.get_default(key)
 
         # call gmt set to change GMT defaults
-        arg_str = " ".join([f'{key}="{value}"' for key, value in kwargs.items()])
         with Session() as lib:
-            lib.call_module(module="set", args=arg_str)
+            lib.call_module(
+                module="set", args=[f"{key}={value}" for key, value in kwargs.items()]
+            )
 
     def __enter__(self):
         """
@@ -213,8 +214,8 @@ def __exit__(self, exc_type, exc_value, traceback):
         """
         Revert GMT configurations to initial values.
         """
-        arg_str = " ".join(
-            [f'{key}="{value}"' for key, value in self.old_defaults.items()]
-        )
         with Session() as lib:
-            lib.call_module(module="set", args=arg_str)
+            lib.call_module(
+                module="set",
+                args=[f"{key}={value}" for key, value in self.old_defaults.items()],
+            )