Correctly handle ~ when reading plot_folder option of monitoring …

…diagnostic (#3449)
ESMValGroup · Nov 30, 2023 · d8b9d24 · d8b9d24
1 parent a648820
commit d8b9d24
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/esmvaltool/diag_scripts/monitor/monitor_base.py b/esmvaltool/diag_scripts/monitor/monitor_base.py
@@ -97,7 +97,9 @@ def __init__(self, config):
         )
         plot_folder = plot_folder.replace('{plot_dir}',
                                           self.cfg[names.PLOT_DIR])
-        self.plot_folder = os.path.abspath(plot_folder)
+        self.plot_folder = os.path.abspath(
+            os.path.expandvars(os.path.expanduser(plot_folder))
+        )
         self.plot_filename = config.get(
             'plot_filename',
             '{plot_type}_{real_name}_{dataset}_{mip}_{exp}_{ensemble}')
@@ -293,11 +295,7 @@ def get_plot_folder(self, var_info):
             'real_name': self._real_name(var_info['variable_group']),
             **var_info
         }
-        folder = os.path.expandvars(
-            os.path.expanduser(
-                list(_replace_tags(self.plot_folder, info))[0]
-            )
-        )
+        folder = list(_replace_tags(self.plot_folder, info))[0]
         if self.plot_folder.startswith('/'):
             folder = '/' + folder
         if not os.path.isdir(folder):