Unsafe fixes

Author: schlunma

esmvalcore/cmor/_fixes/fix.py

@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
+import contextlib
 import importlib
 import inspect
 import logging
 import tempfile
-from collections.abc import Sequence
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -30,6 +30,8 @@
 from esmvalcore.iris_helpers import has_unstructured_grid, safe_convert_units
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from esmvalcore.cmor.table import CoordinateInfo, VariableInfo
     from esmvalcore.config import Session
 
@@ -165,7 +167,8 @@ def get_cube_from_list(
         for cube in cubes:
             if cube.var_name == short_name:
                 return cube
-        raise ValueError(f'Cube for variable "{short_name}" not found')
+        msg = f'Cube for variable "{short_name}" not found'
+        raise ValueError(msg)
 
     def fix_data(self, cube: Cube) -> Cube:
         """Apply fixes to the data of the cube.
@@ -259,37 +262,33 @@ def get_fixes(
         if project == "cordex":
             driver = extra_facets["driver"].replace("-", "_").lower()
             extra_facets["dataset"] = dataset
-            try:
+            with contextlib.suppress(ImportError):
                 fixes_modules.append(
                     importlib.import_module(
                         f"esmvalcore.cmor._fixes.{project}.{driver}.{dataset}",
                     ),
                 )
-            except ImportError:
-                pass
             fixes_modules.append(
                 importlib.import_module(
                     "esmvalcore.cmor._fixes.cordex.cordex_fixes",
                 ),
             )
         else:
-            try:
+            with contextlib.suppress(ImportError):
                 fixes_modules.append(
                     importlib.import_module(
                         f"esmvalcore.cmor._fixes.{project}.{dataset}",
                     ),
                 )
-            except ImportError:
-                pass
 
         for fixes_module in fixes_modules:
-            classes = dict(
-                (name.lower(), value)
+            classes = {
+                name.lower(): value
                 for (name, value) in inspect.getmembers(
                     fixes_module,
                     inspect.isclass,
                 )
-            )
+            }
             for fix_name in (short_name, mip.lower(), "allvars"):
                 if fix_name in classes:
                     fixes.append(
@@ -711,7 +710,7 @@ def _fix_longitude_0_360(
         cube_coord: Coord,
     ) -> tuple[Cube, Coord]:
         """Fix longitude coordinate to be in [0, 360]."""
-        if not cube_coord.standard_name == "longitude":
+        if cube_coord.standard_name != "longitude":
             return (cube, cube_coord)
 
         points = cube_coord.core_points()

esmvalcore/cmor/_fixes/native6/era5.py

@@ -33,9 +33,12 @@ def get_frequency(cube):
             "Percentage of the Grid Cell Occupied by Land (Including Lakes)",
         )
         if cube.long_name not in acceptable_long_names:
-            raise ValueError(
+            msg = (
                 "Unable to infer frequency of cube "
-                f"with length 1 time dimension: {cube}",
+                f"with length 1 time dimension: {cube}"
+            )
+            raise ValueError(
+                msg,
             )
         return "fx"
 
@@ -63,9 +66,12 @@ def fix_accumulated_units(cube):
     elif get_frequency(cube) == "hourly":
         cube.units = cube.units * "h-1"
     elif get_frequency(cube) == "daily":
-        raise NotImplementedError(
+        msg = (
             f"Fixing of accumulated units of cube "
-            f"{cube.summary(shorten=True)} is not implemented for daily data",
+            f"{cube.summary(shorten=True)} is not implemented for daily data"
+        )
+        raise NotImplementedError(
+            msg,
         )
     return cube
 

esmvalcore/cmor/fix.py

@@ -9,8 +9,6 @@
 
 import logging
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
-from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from iris.cube import Cube, CubeList
@@ -19,7 +17,10 @@
 from esmvalcore.local import _get_start_end_date
 
 if TYPE_CHECKING:
-    from ..config import Session
+    from collections.abc import Iterable, Sequence
+    from pathlib import Path
+
+    from esmvalcore.config import Session
 
 logger = logging.getLogger(__name__)