Call insert_alias from inside use_alias

Author: Meghan Jones

pygmt/helpers/decorators.py

@@ -262,6 +262,30 @@ def fmt_docstring(module_func):
     return module_func
 
 
+def insert_alias(module_func):
+    """
+    Decorator insertings aliases into the signature of a method.
+    """
+
+    # Get current signature and parameters
+    sig = signature(module_func)
+    wrapped_params = list(sig.parameters.values())
+    kwargs_param = wrapped_params.pop(-1)
+    # Add new parameters from aliases
+    for alias in module_func.aliases.values():
+        if alias not in sig.parameters.keys():
+            new_param = Parameter(
+                alias, kind=Parameter.POSITIONAL_OR_KEYWORD, default=None
+            )
+            wrapped_params = wrapped_params + [new_param]
+    all_params = wrapped_params + [kwargs_param]
+    # Update method signature
+    sig_new = sig.replace(parameters=all_params)
+    module_func.__signature__ = sig_new
+
+    return module_func
+
+
 def use_alias(**aliases):
     """
     Decorator to add aliases to keyword arguments of a function.
@@ -323,35 +347,13 @@ def new_module(*args, **kwargs):
 
         new_module.aliases = aliases
 
+        new_module = insert_alias(new_module)
+
         return new_module
 
     return alias_decorator
 
 
-def insert_alias(module_func):
-    """
-    Decorator insertings aliases into the signature of a method.
-    """
-
-    # Get current signature and parameters
-    sig = signature(module_func)
-    wrapped_params = list(sig.parameters.values())
-    kwargs_param = wrapped_params.pop(-1)
-    # Add new parameters from aliases
-    for alias in module_func.aliases.values():
-        if alias not in sig.parameters.keys():
-            new_param = Parameter(
-                alias, kind=Parameter.POSITIONAL_OR_KEYWORD, default=None
-            )
-            wrapped_params = wrapped_params + [new_param]
-    all_params = wrapped_params + [kwargs_param]
-    # Update method signature
-    sig_new = sig.replace(parameters=all_params)
-    module_func.__signature__ = sig_new
-
-    return module_func
-
-
 def kwargs_to_strings(**conversions):
     """
     Decorator to convert given keyword arguments to strings.

pygmt/src/blockm.py

@@ -10,7 +10,6 @@
     data_kind,
     dummy_context,
     fmt_docstring,
-    insert_alias,
     kwargs_to_strings,
     use_alias,
 )
@@ -72,7 +71,6 @@ def _blockm(block_method, table, outfile, **kwargs):
 
 
 @fmt_docstring
-@insert_alias
 @use_alias(
     I="spacing",
     R="region",
@@ -134,7 +132,6 @@ def blockmean(table, outfile=None, **kwargs):
 
 
 @fmt_docstring
-@insert_alias
 @use_alias(
     I="spacing",
     R="region",