Updte timestamp

Author: seisman

pygmt/src/timestamp.py

@@ -7,8 +7,9 @@
 from typing import TYPE_CHECKING
 
 from packaging.version import Version
+from pygmt.alias import Alias, convert_aliases
 from pygmt.clib import Session, __gmt_version__
-from pygmt.helpers import build_arg_string, kwargs_to_strings
+from pygmt.helpers import build_arg_string, is_nonstr_iter
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -17,7 +18,6 @@
 __doctest_skip__ = ["timestamp"]
 
 
-@kwargs_to_strings(offset="sequence")
 def timestamp(
     self,
     text: str | None = None,
@@ -82,17 +82,22 @@ def timestamp(
     """
     self._preprocess()
 
-    # Build the options passed to the "plot" module
-    kwdict: dict = {"T": True, "U": ""}
-    if label is not None:
-        kwdict["U"] += f"{label}"
-    kwdict["U"] += f"+j{justification}"
-
-    if Version(__gmt_version__) <= Version("6.4.0") and "/" not in str(offset):
-        # Giving a single offset doesn't work in GMT <= 6.4.0.
-        # See https://github.com/GenericMappingTools/gmt/issues/7107.
-        offset = f"{offset}/{offset}"
-    kwdict["U"] += f"+o{offset}"
+    # Aliases from PyGMT parameters to GMT options
+    _aliases = [
+        Alias("label", "U", "", ""),
+        Alias("justification", "U", "+j", ""),
+        Alias("offset", "U", "+o", "/"),
+        Alias("text", "U", "+t", ""),
+    ]
+
+    # Giving a single offset doesn't work in GMT <= 6.4.0.
+    # See https://github.com/GenericMappingTools/gmt/issues/7107.
+    if (
+        Version(__gmt_version__) <= Version("6.4.0")
+        and not is_nonstr_iter(offset)
+        and "/" not in str(offset)
+    ):
+        offset = (offset, offset)
 
     # The +t modifier was added in GMT 6.5.0.
     # See https://github.com/GenericMappingTools/gmt/pull/7127.
@@ -106,13 +111,16 @@ def timestamp(
         if Version(__gmt_version__) <= Version("6.4.0"):
             # workaround for GMT<=6.4.0 by overriding the 'timefmt' parameter
             timefmt = text[:64]
-        else:
-            kwdict["U"] += f"+t{text}"
+            text = None  # reset 'text' to None
+
+    # Build the options passed to the "plot" module
+    options = convert_aliases()
+    options["T"] = True
 
     with Session() as lib:
         lib.call_module(
             module="plot",
             args=build_arg_string(
-                kwdict, confdict={"FONT_LOGO": font, "FORMAT_TIME_STAMP": timefmt}
+                options, confdict={"FONT_LOGO": font, "FORMAT_TIME_STAMP": timefmt}
             ),
         )