Consistently pass keyword arguments when using call_module() (#1910)

Author: seisman

pygmt/figure.py

@@ -104,7 +104,7 @@ def _activate_figure(self):
         # Passing format '-' tells pygmt.end to not produce any files.
         fmt = "-"
         with Session() as lib:
-            lib.call_module("figure", f"{self._name} {fmt}")
+            lib.call_module(module="figure", args=f"{self._name} {fmt}")
 
     def _preprocess(self, **kwargs):
         """
@@ -245,7 +245,9 @@ def psconvert(self, icc_gray=False, **kwargs):
             raise GMTInvalidInput("The 'prefix' must be specified.") from err
 
         with Session() as lib:
-            lib.call_module("psconvert", f"{prefix_arg} {build_arg_string(kwargs)}")
+            lib.call_module(
+                module="psconvert", args=f"{prefix_arg} {build_arg_string(kwargs)}"
+            )
 
     def savefig(
         self, fname, transparent=False, crop=True, anti_alias=True, show=False, **kwargs
@@ -421,7 +423,7 @@ def shift_origin(self, xshift=None, yshift=None):
             args.append(f"-Y{yshift}")
 
         with Session() as lib:
-            lib.call_module("plot", " ".join(args))
+            lib.call_module(module="plot", args=" ".join(args))
 
     def _preview(self, fmt, dpi, as_bytes=False, **kwargs):
         """

pygmt/session_management.py

@@ -14,9 +14,9 @@ def begin():
     """
     prefix = "pygmt-session"
     with Session() as lib:
-        lib.call_module("begin", prefix)
+        lib.call_module(module="begin", args=prefix)
         # pygmt relies on GMT modern mode with GMT_COMPATIBILITY at version 6
-        lib.call_module("set", "GMT_COMPATIBILITY 6")
+        lib.call_module(module="set", args="GMT_COMPATIBILITY 6")
 
 
 def end():
@@ -29,4 +29,4 @@ def end():
     ``pygmt.begin``), and bring the figures to the working directory.
     """
     with Session() as lib:
-        lib.call_module("end", "")
+        lib.call_module(module="end", args="")

pygmt/src/basemap.py

@@ -94,4 +94,4 @@ def basemap(self, **kwargs):
     if not args_in_kwargs(args=["B", "L", "Td", "Tm", "c"], kwargs=kwargs):
         kwargs["B"] = True  # Plotting frames if required arguments not given
     with Session() as lib:
-        lib.call_module("basemap", build_arg_string(kwargs))
+        lib.call_module(module="basemap", args=build_arg_string(kwargs))

pygmt/src/coast.py

@@ -189,4 +189,4 @@ def coast(self, **kwargs):
             lakes, land, water, rivers, borders, dcw, Q, or shorelines"""
         )
     with Session() as lib:
-        lib.call_module("coast", build_arg_string(kwargs))
+        lib.call_module(module="coast", args=build_arg_string(kwargs))

pygmt/src/colorbar.py

@@ -107,4 +107,4 @@ def colorbar(self, **kwargs):
     """
     kwargs = self._preprocess(**kwargs)  # pylint: disable=protected-access
     with Session() as lib:
-        lib.call_module("colorbar", build_arg_string(kwargs))
+        lib.call_module(module="colorbar", args=build_arg_string(kwargs))

pygmt/src/config.py

@@ -57,7 +57,7 @@ def __init__(self, **kwargs):
         # 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("set", arg_str)
+            lib.call_module(module="set", args=arg_str)
 
     def __enter__(self):
         return self
@@ -68,4 +68,4 @@ def __exit__(self, exc_type, exc_value, traceback):
             [f"{key}={value}" for key, value in self.old_defaults.items()]
         )
         with Session() as lib:
-            lib.call_module("set", arg_str)
+            lib.call_module(module="set", args=arg_str)

pygmt/src/contour.py

@@ -132,4 +132,6 @@ def contour(self, data=None, x=None, y=None, z=None, **kwargs):
             check_kind="vector", data=data, x=x, y=y, z=z, required_z=True
         )
         with file_context as fname:
-            lib.call_module("contour", build_arg_string(kwargs, infile=fname))
+            lib.call_module(
+                module="contour", args=build_arg_string(kwargs, infile=fname)
+            )

pygmt/src/dimfilter.py

@@ -139,6 +139,6 @@ def dimfilter(grid, **kwargs):
                     kwargs.update({"G": tmpfile.name})
                 outgrid = kwargs["G"]
                 arg_str = " ".join([infile, build_arg_string(kwargs)])
-                lib.call_module("dimfilter", arg_str)
+                lib.call_module(module="dimfilter", args=arg_str)
 
         return load_dataarray(outgrid) if outgrid == tmpfile.name else None

pygmt/src/grd2cpt.py

@@ -172,4 +172,4 @@ def grd2cpt(grid, **kwargs):
                 if not outfile or not isinstance(outfile, str):
                     raise GMTInvalidInput("'output' should be a proper file name.")
                 arg_str = build_arg_string(kwargs, infile=infile, outfile=outfile)
-            lib.call_module("grd2cpt", arg_str)
+            lib.call_module(module="grd2cpt", args=arg_str)

pygmt/src/grd2xyz.py

@@ -179,7 +179,8 @@ def grd2xyz(grid, output_type="pandas", outfile=None, **kwargs):
                 if outfile is None:
                     outfile = tmpfile.name
                 lib.call_module(
-                    "grd2xyz", build_arg_string(kwargs, infile=infile, outfile=outfile)
+                    module="grd2xyz",
+                    args=build_arg_string(kwargs, infile=infile, outfile=outfile),
                 )
 
         # Read temporary csv output to a pandas table