Unsafe fixes

Author: bouweandela

doc/gensidebar.py

@@ -42,15 +42,15 @@ def _write(project, desc, link, mapping=conf["intersphinx_mapping"]):
         if project != conf_api:
             if do_gen:
                 args = desc, mapping[project][0], link
-                lines.append("    %s <%s%s.html>" % args)
+                lines.append("    {} <{}{}.html>".format(*args))
         else:
             args = desc, link
-            lines.append("    %s <%s>" % args)
+            lines.append("    {} <{}>".format(*args))
 
     def _header(project, text):
         if project == conf_api or do_gen:
             lines.extend([".. toctree::", "   :maxdepth: 2"])
-            lines.extend(["   :caption: %s" % text, ""])
+            lines.extend([f"   :caption: {text}", ""])
 
     #
     # Specify the sidebar contents here

esmvalcore/_citation.py

@@ -193,7 +193,7 @@ def _json_to_bibtex(data):
         doi = data["identifier"].get("id", "doi not found")
         url = f"https://doi.org/{doi}"
 
-    bibtex_entry = textwrap.dedent(f"""
+    return textwrap.dedent(f"""
         @misc{{{url},
         \turl = {{{url}}},
         \ttitle = {{{title}}},
@@ -203,7 +203,6 @@ def _json_to_bibtex(data):
         \tdoi = {{{doi}}},
         }}
         """).lstrip()
-    return bibtex_entry
 
 
 @lru_cache(maxsize=1024)
@@ -226,11 +225,7 @@ def _collect_bibtex_citation(tag):
 def _collect_cmip_citation(json_url):
     """Collect information from CMIP6 Data Citation Service."""
     json_data = _get_response(json_url)
-    if json_data:
-        bibtex_entry = _json_to_bibtex(json_data)
-    else:
-        bibtex_entry = ""
-    return bibtex_entry
+    return _json_to_bibtex(json_data) if json_data else ""
 
 
 def _make_url_prefix(attribute):
@@ -246,17 +241,14 @@ def _make_url_prefix(attribute):
     for key, value in attribute:
         if key.localpart in localpart:
             localpart[key.localpart] = value
-    url_prefix = ".".join(localpart.values())
-    return url_prefix
+    return ".".join(localpart.values())
 
 
 def _make_json_url(url_prefix):
     """Make json url based on CMIP6 Data Citation Service."""
-    json_url = f"{CMIP6_URL_STEM}/cerarest/exportcmip6?input={url_prefix}"
-    return json_url
+    return f"{CMIP6_URL_STEM}/cerarest/exportcmip6?input={url_prefix}"
 
 
 def _make_info_url(url_prefix):
     """Make info url based on CMIP6 Data Citation Service."""
-    info_url = f"{CMIP6_URL_STEM}/cmip6?input={url_prefix}"
-    return info_url
+    return f"{CMIP6_URL_STEM}/cmip6?input={url_prefix}"

esmvalcore/_main.py

@@ -65,9 +65,12 @@ def parse_resume(resume, recipe):
     for resume_dir in resume:
         resume_recipe = resume_dir / "run" / recipe.name
         if current_recipe != resume_recipe.read_text(encoding="utf-8"):
-            raise ValueError(
+            msg = (
                 f"Only identical recipes can be resumed, but "
-                f"{resume_recipe} is different from {recipe}",
+                f"{resume_recipe} is different from {recipe}"
+            )
+            raise ValueError(
+                msg,
             )
     return resume
 
@@ -294,9 +297,12 @@ def get(recipe):
         configure_logging(console_log_level="info")
         installed_recipe = DIAGNOSTICS.recipes / recipe
         if not installed_recipe.exists():
-            raise RecipeError(
+            msg = (
                 f"Recipe {recipe} not found. To list all available recipes, "
-                'execute "esmvaltool list"',
+                'execute "esmvaltool list"'
+            )
+            raise RecipeError(
+                msg,
             )
         logger.info("Copying installed recipe to the current folder...")
         shutil.copy(installed_recipe, Path(recipe).name)
@@ -320,9 +326,12 @@ def show(recipe):
         configure_logging(console_log_level="info")
         installed_recipe = DIAGNOSTICS.recipes / recipe
         if not installed_recipe.exists():
-            raise RecipeError(
+            msg = (
                 f"Recipe {recipe} not found. To list all available recipes, "
-                'execute "esmvaltool list"',
+                'execute "esmvaltool list"'
+            )
+            raise RecipeError(
+                msg,
             )
         msg = f"Recipe {recipe}"
         logger.info(msg)
@@ -390,9 +399,12 @@ def run(self, recipe, **kwargs):
         if cli_config_dir is not None:
             cli_config_dir = Path(cli_config_dir).expanduser().absolute()
             if not cli_config_dir.is_dir():
-                raise NotADirectoryError(
+                msg = (
                     f"Invalid --config_dir given: {cli_config_dir} is not an "
-                    f"existing directory",
+                    f"existing directory"
+                )
+                raise NotADirectoryError(
+                    msg,
                 )
 
         # TODO: remove in v2.14.0
@@ -416,10 +428,13 @@ def run(self, recipe, **kwargs):
             # validated) when importing the module with `from .config import
             # CFG`
             except InvalidConfigParameter as exc:
-                raise InvalidConfigParameter(
+                msg = (
                     f"Failed to parse configuration directory "
                     f"{cli_config_dir} (command line argument): "
-                    f"{exc!s}",
+                    f"{exc!s}"
+                )
+                raise InvalidConfigParameter(
+                    msg,
                 ) from exc
 
         recipe = self._get_recipe(recipe)
@@ -456,9 +471,12 @@ def _create_session_dir(session):
                 session.session_name = session_dir.name
                 return
 
-        raise RecipeError(
+        msg = (
             f"Output directory '{session.session_dir}' already exists and"
-            " unable to find alternative, aborting to prevent data loss.",
+            " unable to find alternative, aborting to prevent data loss."
+        )
+        raise RecipeError(
+            msg,
         )
 
     def _run(
@@ -534,8 +552,7 @@ def _get_recipe(recipe) -> Path:
             installed_recipe = DIAGNOSTICS.recipes / recipe
             if os.path.isfile(installed_recipe):
                 recipe = installed_recipe
-        recipe = Path(os.path.expandvars(recipe)).expanduser().absolute()
-        return recipe
+        return Path(os.path.expandvars(recipe)).expanduser().absolute()
 
     @staticmethod
     def _get_config_info(cli_config_dir):

esmvalcore/_provenance.py

@@ -29,13 +29,11 @@ def get_esmvaltool_provenance():
     namespace = "software"
     create_namespace(provenance, namespace)
     attributes = {}  # TODO: add dependencies with versions here
-    activity = provenance.activity(
+    return provenance.activity(
         namespace + ":esmvaltool==" + __version__,
         other_attributes=attributes,
     )
 
-    return activity
-
 
 ESMVALTOOL_PROVENANCE = get_esmvaltool_provenance()
 
@@ -167,7 +165,8 @@ def __hash__(self):
     def copy_provenance(self):
         """Create a copy with identical provenance information."""
         if self.provenance is None:
-            raise ValueError(f"Provenance of {self} not initialized")
+            msg = f"Provenance of {self} not initialized"
+            raise ValueError(msg)
         new = TrackedFile(self.filename, self.attributes)
         new.provenance = copy.deepcopy(self.provenance)
         new.entity = new.provenance.get_record(self.entity.identifier)[0]
@@ -192,8 +191,9 @@ def initialize_provenance(self, activity):
         propagate into the provenance of this file.
         """
         if self.provenance is not None:
+            msg = f"Provenance of {self} already initialized"
             raise ValueError(
-                f"Provenance of {self} already initialized",
+                msg,
             )
         self.provenance = ProvDocument()
         self._initialize_namespaces()
@@ -252,7 +252,8 @@ def wasderivedfrom(self, other):
             other_entity = other
         self.provenance.update(other_entity.bundle)
         if not self.activity:
-            raise ValueError("Activity not initialized.")
+            msg = "Activity not initialized."
+            raise ValueError(msg)
         self.entity.wasDerivedFrom(other_entity, self.activity)
 
     def _select_for_include(self):

esmvalcore/_recipe/_io.py

@@ -39,6 +39,4 @@ def _load_recipe(recipe: Path | str | dict[str, Any] | None) -> dict[str, Any]:
     if isinstance(recipe, str):
         recipe = yaml.safe_load(recipe)
 
-    recipe = _copy(recipe)
-
-    return recipe  # type: ignore
+    return _copy(recipe)