Deprecate arguments with deprecation decorators instead of warnings

Author: emellega

astroquery/esasky/__init__.py

@@ -4,6 +4,7 @@
 from astropy import config as _config
 from astropy.config import paths
 from astropy.utils.exceptions import AstropyDeprecationWarning
+from astropy.utils.decorators import deprecated_attribute
 
 import os
 
@@ -32,47 +33,9 @@ class Conf(_config.ConfigNamespace):
     ESASKY_ROW_LIMIT = _config.ConfigItem(10000, 'Maximum number of rows returned (set to -1 for unlimited).',
                                           aliases=['astroquery.esasky.row_limit'])
 
-    @property
-    def urlBase(self):
-        return self.ESASKY_DOMAIN_SERVER
-
-    @urlBase.setter
-    def urlBase(self, value):
-        warnings.warn(
-            "'urlBase' is deprecated and will be removed in a future version. "
-            "Use 'ESASKY_DOMAIN_SERVER' instead.",
-            AstropyDeprecationWarning,
-            stacklevel=2,
-        )
-        self.ESASKY_DOMAIN_SERVER = value
-
-    @property
-    def timeout(self):
-        return self.ESASKY_CONNECTION_TIMEOUT
-
-    @timeout.setter
-    def timeout(self, value):
-        warnings.warn(
-            "'timeout' is deprecated and will be removed in a future version. "
-            "Use 'ESASKY_CONNECTION_TIMEOUT' instead.",
-            AstropyDeprecationWarning,
-            stacklevel=2,
-        )
-        self.ESASKY_CONNECTION_TIMEOUT = value
-
-    @property
-    def row_limit(self):
-        return self.ESASKY_ROW_LIMIT
-
-    @row_limit.setter
-    def row_limit(self, value):
-        warnings.warn(
-            "'row_limit' is deprecated and will be removed in a future version. "
-            "Use 'ESASKY_ROW_LIMIT' instead.",
-            AstropyDeprecationWarning,
-            stacklevel=2,
-        )
-        self.ESASKY_ROW_LIMIT = value
+    urlBase = deprecated_attribute(name='urlBase', alternative='ESASKY_DOMAIN_SERVER', since='8.0')
+    timeout = deprecated_attribute(name='timeout', alternative='ESASKY_CONNECTION_TIMEOUT', since='8.0')
+    row_limit = deprecated_attribute(name='row_limit', alternative='ESASKY_ROW_LIMIT', since='8.0')
 
     cache_location = os.path.join(paths.get_cache_dir(), 'astroquery/esasky', )
 

astroquery/esasky/core.py

@@ -25,6 +25,7 @@
 from . import conf
 from .. import version
 from astropy.coordinates.name_resolve import sesame_database
+from astropy.utils import deprecated_renamed_argument
 
 
 # We do trust the ESA tar files, this is to avoid the new to Python 3.12 deprecation warning
@@ -82,15 +83,11 @@ class ESASkyClass(EsaTap):
     SSO_TYPES = ['ALL', 'ASTEROID', 'COMET', 'SATELLITE', 'PLANET',
                  'DWARF_PLANET', 'SPACECRAFT', 'SPACEJUNK', 'EXOPLANET', 'STAR']
 
+    @deprecated_renamed_argument('tap_handler', None, since='8.0', message="The 'tap_handler' parameter is deprecated"
+                                 "and will be removed in a future version. Use the ESASky instance directly for TAP"
+                                 "queries (Using esa.utils.EsaTap and PyVO).")
     def __init__(self, *, tap_handler=None, show_messages=False, auth_session=None, tap_url=None):
         super().__init__(auth_session=auth_session, tap_url=tap_url)
-        if tap_handler is not None:
-            warnings.warn(
-                "The 'tap_handler' parameter is deprecated and will be removed in a future version. "
-                "Use the ESASky instance directly for TAP queries (Using esa.utils.EsaTap and PyVO).",
-                AstropyDeprecationWarning,
-                stacklevel=2,
-            )
 
         if show_messages:
             self.get_status_messages()