Fix issues reported by SonarCloud

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
SciQLop · Jun 6, 2024 · a417550 · a417550
1 parent 139503b
commit a417550
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/speasy/core/__init__.py b/speasy/core/__init__.py
@@ -345,9 +345,7 @@ def progress_bar(leave=True, progress=False, desc=None, **kwargs):
         return lambda x: tqdm(x, leave=leave, desc=desc)
 
 
-class EnsureUTC_DateTime(object):
-    def __init__(self):
-        pass
+class EnsureUTCDateTime(object):
 
     def __call__(self, get_data: Callable):
         @wraps(get_data)

diff --git a/speasy/webservices/amda/ws.py b/speasy/webservices/amda/ws.py
@@ -10,7 +10,7 @@
 from .inventory import to_xmlid
 from .utils import get_parameter_args
 from ...config import amda as amda_cfg
-from ...core import AllowedKwargs, make_utc_datetime, EnsureUTC_DateTime
+from ...core import AllowedKwargs, make_utc_datetime, EnsureUTCDateTime
 from ...core.http import is_server_up
 from ...core.cache import CACHE_ALLOWED_KWARGS, Cacheable, CacheCall
 from ...core.dataprovider import (GET_DATA_ALLOWED_KWARGS, DataProvider,
@@ -394,7 +394,7 @@ def get_parameter(self, product, start_time, stop_time,
 
     @AllowedKwargs(
         PROXY_ALLOWED_KWARGS + CACHE_ALLOWED_KWARGS + GET_DATA_ALLOWED_KWARGS + ['output_format', 'restricted_period'])
-    @EnsureUTC_DateTime()
+    @EnsureUTCDateTime()
     @ParameterRangeCheck()
     @Cacheable(prefix="amda", version=product_version, fragment_hours=lambda x: 12, entry_name=_amda_cache_entry_name)
     @Proxyfiable(GetProduct, get_parameter_args)

diff --git a/speasy/webservices/cda/__init__.py b/speasy/webservices/cda/__init__.py
@@ -11,7 +11,7 @@
 from datetime import datetime, timedelta
 from typing import Dict, Optional, Tuple
 
-from speasy.core import AllowedKwargs, EnsureUTC_DateTime
+from speasy.core import AllowedKwargs, EnsureUTCDateTime
 from speasy.core import http, url_utils
 from speasy.core import cdf
 from speasy.config import cdaweb as cda_cfg
@@ -218,7 +218,7 @@ def _get_data_with_direct_archive(self, product, start_time: datetime, stop_time
 
     @AllowedKwargs(
         PROXY_ALLOWED_KWARGS + CACHE_ALLOWED_KWARGS + GET_DATA_ALLOWED_KWARGS + ['if_newer_than', 'method'])
-    @EnsureUTC_DateTime()
+    @EnsureUTCDateTime()
     @ParameterRangeCheck()
     def get_data(self, product, start_time: datetime, stop_time: datetime, if_newer_than: datetime or None = None,
                  extra_http_headers: Dict or None = None, method: Optional[str] = None, **kwargs) -> Optional[

diff --git a/speasy/webservices/csa/__init__.py b/speasy/webservices/csa/__init__.py
@@ -7,7 +7,7 @@
 
 from astroquery.utils.tap.core import TapPlus
 
-from speasy.core import any_files, AllowedKwargs, fix_name
+from speasy.core import any_files, AllowedKwargs, fix_name, EnsureUTCDateTime
 from speasy.core import cdf
 from speasy.core.cache import Cacheable, CACHE_ALLOWED_KWARGS  # _cache is used for tests (hack...)
 from speasy.core.dataprovider import DataProvider, ParameterRangeCheck, GET_DATA_ALLOWED_KWARGS
@@ -223,6 +223,7 @@ def product_last_update(self, product: str or ParameterIndex):
         return self.flat_inventory.datasets[dataset].date_last_update
 
     @AllowedKwargs(PROXY_ALLOWED_KWARGS + CACHE_ALLOWED_KWARGS + GET_DATA_ALLOWED_KWARGS)
+    @EnsureUTCDateTime()
     @ParameterRangeCheck()
     @Cacheable(prefix="csa", fragment_hours=lambda x: 12, version=product_last_update)
     @SplitLargeRequests(threshold=lambda x: timedelta(days=7))

diff --git a/speasy/webservices/ssc/__init__.py b/speasy/webservices/ssc/__init__.py
@@ -13,7 +13,7 @@
 
 import numpy as np
 
-from speasy.core import EnsureUTC_DateTime
+from speasy.core import EnsureUTCDateTime
 from speasy.core.cache import Cacheable, CacheCall, CACHE_ALLOWED_KWARGS
 from speasy.core.dataprovider import DataProvider, ParameterRangeCheck, GET_DATA_ALLOWED_KWARGS
 from speasy.core.datetime_range import DateTimeRange
@@ -144,7 +144,7 @@ def get_data(self, product: str, start_time: datetime, stop_time: datetime, coor
     @AllowedKwargs(
         PROXY_ALLOWED_KWARGS + CACHE_ALLOWED_KWARGS + GET_DATA_ALLOWED_KWARGS + ['coordinate_system',
                                                                                  'debug'])
-    @EnsureUTC_DateTime()
+    @EnsureUTCDateTime()
     @ParameterRangeCheck()
     @Cacheable(prefix="ssc_orbits", fragment_hours=lambda x: 24, version=version, entry_name=_make_cache_entry_name)
     @SplitLargeRequests(threshold=lambda x: timedelta(days=60))