@@ -200,7 +200,7 @@ def _value(self) -> str | list[str] | None:
200
200
201
201
class AliasSystem :
202
202
"""
203
- Alias system for converting long-form PyGMT parameters to GMT short-form options.
203
+ Alias system for mapping PyGMT's long-form parameters to GMT's short-form options.
204
204
205
205
This class is initialized with keyword arguments, where each key is a GMT option
206
206
flag, and the corresponding value is an ``Alias`` object or a list of ``Alias``
@@ -281,37 +281,30 @@ def update(self, kwargs: Mapping[str, Any]):
281
281
# Long-form parameters exist.
282
282
if aliases := self .aliasdict .get (short_param ):
283
283
if not isinstance (aliases , Sequence ): # Single Alias object.
284
- _params = repr (aliases .name )
285
- _msg_long_params = f"Use long-form parameter { _params } instead."
284
+ _msg_long = f"Use long-form parameter { aliases .name !r} instead."
286
285
else : # Sequence of Alias objects.
287
- _params = ", " .join (
288
- [repr (alias .name ) for alias in aliases if not alias .prefix ]
289
- )
290
- _modifiers = ", " .join (
291
- [
292
- repr (alias .name ) + f" ({ alias .prefix } )"
293
- for alias in aliases
294
- if alias .prefix
295
- ]
296
- )
297
- _msg_long_params = (
298
- f"Use long-form parameters { _params } , "
299
- f"with optional parameters { _modifiers } instead."
286
+ _params = [f"{ v .name !r} " for v in aliases if not v .prefix ]
287
+ _modifiers = [
288
+ f"{ v .name !r} ({ v .prefix } )" for v in aliases if v .prefix
289
+ ]
290
+ _msg_long = (
291
+ f"Use long-form parameters { ', ' .join (_params )} , "
292
+ f"with optional parameters { ', ' .join (_modifiers )} instead."
300
293
)
301
294
302
295
# Long-form parameters are already specified.
303
296
if short_param in self .kwdict :
304
297
msg = (
305
298
f"Short-form parameter { short_param !r} conflicts with "
306
299
"long-form parameters and is not recommended. "
307
- f"{ _msg_long_params } "
300
+ f"{ _msg_long } "
308
301
)
309
302
raise GMTInvalidInput (msg )
310
303
311
304
# Long-form parameters are not specified.
312
305
msg = (
313
306
f"Short-form parameter { short_param !r} is not recommended. "
314
- f"{ _msg_long_params } "
307
+ f"{ _msg_long } "
315
308
)
316
309
warnings .warn (msg , category = SyntaxWarning , stacklevel = 2 )
317
310
0 commit comments