Improve the code structure

Author: seisman

pygmt/src/basemap.py

@@ -82,9 +82,14 @@ def basemap(self, frame=None, **kwargs):
     {perspective}
     {transparency}
     """
-    alias = AliasSystem(
-        B=Alias(frame),
-    )
     kwargs = self._preprocess(**kwargs)
+
+    kwdict = (
+        AliasSystem(
+            B=Alias(frame),
+        ).kwdict
+        | kwargs
+    )
+
     with Session() as lib:
-        lib.call_module(module="basemap", args=build_arg_list(alias.kwdict | kwargs))
+        lib.call_module(module="basemap", args=build_arg_list(kwdict))

pygmt/src/binstats.py

@@ -109,34 +109,37 @@ def binstats(
         - ``None`` if ``outgrid`` is set (grid output will be stored in the file set by
           ``outgrid``)
     """
-    alias = AliasSystem(
-        C=Alias(
-            statistic,
-            mapping={
-                "mean": "a",
-                "mad": "d",
-                "full": "g",
-                "interquartile": "i",
-                "min": "l",
-                "minpos": "L",
-                "median": "m",
-                "number": "n",
-                "lms": "o",
-                "mode": "p",
-                "quantile": "q",
-                "rms": "r",
-                "stddev": "s",
-                "max": "u",
-                "maxneg": "U",
-                "sum": "z",
-            },
-        ),
-        G=Alias(outgrid),
+    kwdict = (
+        AliasSystem(
+            C=Alias(
+                statistic,
+                mapping={
+                    "mean": "a",
+                    "mad": "d",
+                    "full": "g",
+                    "interquartile": "i",
+                    "min": "l",
+                    "minpos": "L",
+                    "median": "m",
+                    "number": "n",
+                    "lms": "o",
+                    "mode": "p",
+                    "quantile": "q",
+                    "rms": "r",
+                    "stddev": "s",
+                    "max": "u",
+                    "maxneg": "U",
+                    "sum": "z",
+                },
+            ),
+            G=Alias(outgrid),
+        ).kwdict
+        | kwargs
     )
+
     if statistic == "quantile":
         statistic += str(quantile_value)
 
-    kwdict = alias.kwdict | kwargs
     with Session() as lib:
         with (
             lib.virtualfile_in(check_kind="vector", data=data) as vintbl,

pygmt/src/coast.py

@@ -210,15 +210,20 @@ def coast(
     >>> # Show the plot
     >>> fig.show()
     """
-    alias = AliasSystem(
-        D=Alias(resolution, mapping=True),
-    )
     kwargs = self._preprocess(**kwargs)
     if not args_in_kwargs(args=["C", "G", "S", "I", "N", "E", "Q", "W"], kwargs=kwargs):
         msg = (
             "At least one of the following parameters must be specified: "
             "lakes, land, water, rivers, borders, dcw, Q, or shorelines."
         )
         raise GMTInvalidInput(msg)
+
+    kwdict = (
+        AliasSystem(
+            D=Alias(resolution, mapping=True),
+        ).kwdict
+        | kwargs
+    )
+
     with Session() as lib:
-        lib.call_module(module="coast", args=build_arg_list(alias.kwdict | kwargs))
+        lib.call_module(module="coast", args=build_arg_list(kwdict))

pygmt/src/dimfilter.py

@@ -134,16 +134,6 @@ def dimfilter(
     ...     region=[-55, -51, -24, -19],
     ... )
     """
-    alias = AliasSystem(
-        D=Alias(distance),
-        G=Alias(outgrid),
-        F=Alias(filter),
-        I=Alias(spacing, separator="/"),
-        N=Alias(sectors),
-        R=Alias(region, separator="/"),
-        V=Alias(verbose),
-    )
-
     if (
         not all(v is not None for v in [distance, filter, sectors])
         and "Q" not in kwargs
@@ -153,7 +143,20 @@ def dimfilter(
             "distance, filters, or sectors."
         )
         raise GMTInvalidInput(msg)
-    kwdict = alias.kwdict | kwargs
+
+    kwdict = (
+        AliasSystem(
+            D=Alias(distance),
+            G=Alias(outgrid),
+            F=Alias(filter),
+            I=Alias(spacing, separator="/"),
+            N=Alias(sectors),
+            R=Alias(region, separator="/"),
+            V=Alias(verbose),
+        ).kwdict
+        | kwargs
+    )
+
     with Session() as lib:
         with (
             lib.virtualfile_in(check_kind="raster", data=grid) as vingrd,

pygmt/src/image.py

@@ -72,27 +72,29 @@ def image(  # noqa: PLR0913
     {perspective}
     {transparency}
     """
-    alias = AliasSystem(
-        R=Alias(region, separator="/"),
-        J=Alias(projection),
-        D=[
-            Alias(position, separator="/", prefix=position_type),
-            Alias(dimension, prefix="+w", separator="/"),
-            Alias(repeat, prefix="+n", separator="/"),
-            Alias(offset, prefix="+o", separator="/"),
-            Alias(dpi, prefix="+r"),
-        ],
-        F=Alias(box),
-        G=Alias(bitcolor),
-        M=Alias(monochrome),
-        V=Alias(verbose),
-        c=Alias(panel, separator=","),
-        p=Alias(perspective, separator="/"),
-        t=Alias(transparency),
+    kwargs = self._preprocess(**kwargs)
+
+    kwdict = (
+        AliasSystem(
+            R=Alias(region, separator="/"),
+            J=Alias(projection),
+            D=[
+                Alias(position, separator="/", prefix=position_type),
+                Alias(dimension, prefix="+w", separator="/"),
+                Alias(repeat, prefix="+n", separator="/"),
+                Alias(offset, prefix="+o", separator="/"),
+                Alias(dpi, prefix="+r"),
+            ],
+            F=Alias(box),
+            G=Alias(bitcolor),
+            M=Alias(monochrome),
+            V=Alias(verbose),
+            c=Alias(panel, separator=","),
+            p=Alias(perspective, separator="/"),
+            t=Alias(transparency),
+        ).kwdict
+        | kwargs
     )
 
-    kwargs = self._preprocess(**kwargs)
     with Session() as lib:
-        lib.call_module(
-            module="image", args=build_arg_list(alias.kwdict | kwargs, infile=imagefile)
-        )
+        lib.call_module(module="image", args=build_arg_list(kwdict, infile=imagefile))

pygmt/src/logo.py

@@ -63,15 +63,20 @@ def logo(
     {panel}
     {transparency}
     """
-    alias = AliasSystem(
-        D=[
-            Alias(position, separator="/", prefix=position_type),
-            Alias(length, prefix="+w"),
-            Alias(height, prefix="+h"),
-            Alias(offset, prefix="+o", separator="/"),
-        ],
-        F=Alias(box),
-    )
     kwargs = self._preprocess(**kwargs)
+
+    kwdict = (
+        AliasSystem(
+            D=[
+                Alias(position, separator="/", prefix=position_type),
+                Alias(length, prefix="+w"),
+                Alias(height, prefix="+h"),
+                Alias(offset, prefix="+o", separator="/"),
+            ],
+            F=Alias(box),
+        ).kwdict
+        | kwargs
+    )
+
     with Session() as lib:
-        lib.call_module(module="logo", args=build_arg_list(alias.kwdict | kwargs))
+        lib.call_module(module="logo", args=build_arg_list(kwdict))

pygmt/src/scalebar.py

@@ -49,6 +49,8 @@ def scalebar(  # noqa: PLR0913
     ... )
     >>> fig.show()
     """
+    self._preprocess()
+
     kwdict = AliasSystem(
         L=[
             Alias(position, separator="/", prefix=position_type),
@@ -65,6 +67,5 @@ def scalebar(  # noqa: PLR0913
         F=Alias(box),
     ).kwdict
 
-    self._preprocess()
     with Session() as lib:
         lib.call_module(module="basemap", args=build_arg_list(kwdict))