Merge pull request #4 from hjoliver/more-meta-mods

Allow plain "URL" in event handler templates.
cylc · Aug 15, 2017 · ff3187a · ff3187a
2 parents cf0b8f5 + 9c9c520
commit ff3187a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/cylc/suite_events.py b/lib/cylc/suite_events.py
@@ -146,9 +146,9 @@ def _run_event_custom_handlers(self, config, ctx):
                 if config.cfg['meta']:
                     for key, value in config.cfg['meta'].items():
                         if key == "URL":
+                            # Back compat (pre meta section).
                             handler_data["suite_url"] = quote(value)
-                        else:
-                            handler_data[key] = quote(value)
+                        handler_data[key] = quote(value)
                 cmd = handler % (handler_data)
             except KeyError as exc:
                 message = "%s bad template: %s" % (cmd_key, exc)

diff --git a/lib/cylc/task_events_mgr.py b/lib/cylc/task_events_mgr.py
@@ -836,9 +836,9 @@ def _setup_custom_event_handlers(self, itask, event, message):
                 if itask.tdef.rtconfig['meta']:
                     for key, value in itask.tdef.rtconfig['meta'].items():
                         if key == "URL":
+                            # Back compat (pre meta section).
                             handler_data["task_url"] = quote(value)
-                        else:
-                            handler_data[key] = quote(value)
+                        handler_data[key] = quote(value)
 
                 cmd = handler % (handler_data)
             except KeyError as exc: