Use the new exception

Author: seisman

pygmt/figure.py

@@ -20,7 +20,7 @@
 
 import numpy as np
 from pygmt.clib import Session
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTInvalidInput, GMTValueError
 from pygmt.helpers import launch_external_viewer, unique_name
 
 
@@ -358,11 +358,11 @@ def show(
             case "none":
                 pass  # Do nothing
             case _:
-                msg = (
-                    f"Invalid display method '{method}'. "
-                    "Valid values are 'external', 'notebook', 'none' or None."
+                raise GMTValueError(
+                    name="method",
+                    value=method,
+                    choices=["external", "notebook", "none", None],
                 )
-                raise GMTInvalidInput(msg)
 
     @overload
     def _preview(
@@ -494,8 +494,8 @@ def set_display(method: Literal["external", "notebook", "none", None] = None) ->
         case None:
             SHOW_CONFIG["method"] = _get_default_display_method()
         case _:
-            msg = (
-                f"Invalid display method '{method}'. "
-                "Valid values are 'external', 'notebook', 'none' or None."
+            raise GMTValueError(
+                name="method",
+                value=method,
+                choices=["external", "notebook", "none", None],
             )
-            raise GMTInvalidInput(msg)

pygmt/tests/test_figure.py

@@ -12,7 +12,7 @@
 import numpy.testing as npt
 import pytest
 from pygmt import Figure, set_display
-from pygmt.exceptions import GMTInvalidInput
+from pygmt.exceptions import GMTInvalidInput, GMTValueError
 from pygmt.figure import SHOW_CONFIG, _get_default_display_method
 from pygmt.helpers import GMTTempFile
 
@@ -313,7 +313,7 @@ def test_figure_show_invalid_method():
     """
     fig = Figure()
     fig.basemap(region="10/70/-300/800", projection="X3i/5i", frame="af")
-    with pytest.raises(GMTInvalidInput):
+    with pytest.raises(GMTValueError):
         fig.show(method="test")
 
 
@@ -398,7 +398,7 @@ def test_invalid_method(self):
         """
         Test if an error is raised when an invalid method is passed.
         """
-        with pytest.raises(GMTInvalidInput):
+        with pytest.raises(GMTValueError):
             set_display(method="invalid")