rose edit: license and lint (#2998)

* update license headers
* remove invalid shebang
* remove Python 2 object inheritance
* lint: fix B009
* lint: fix C403
* lint: fix C416
* lint: fix SIM102
* lint: fix C414
* lint: fix SIM105
* lint: fix C419
* lint: fix C405
* lint: fix B010

Author: oliver-sanders

metomi/rose/apps/rose_ana.py

@@ -167,7 +167,7 @@ def buffer_to_db(self, reporter=None):
         self.statement_buffer = []
 
 
-class AnalysisTask(object, metaclass=abc.ABCMeta):
+class AnalysisTask(metaclass=abc.ABCMeta):
     """Base class for an analysis task.
 
     All custom user tasks should inherit from this class and override

metomi/rose/config_editor/__init__.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify

metomi/rose/config_editor/data.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 )
 
 
-class VarData(object):
+class VarData:
     """Stores past, present, and missing variables."""
 
     def __init__(self, v_map, latent_v_map, save_v_map, latent_save_v_map):
@@ -105,7 +102,7 @@ def get_var(self, section, option, save=False, skip_latent=False):
         return None
 
 
-class SectData(object):
+class SectData:
     """Stores past, present, and missing sections."""
 
     def __init__(
@@ -145,7 +142,7 @@ def get_sect(self, section, save=False, skip_latent=False):
         return None
 
 
-class ConfigData(object):
+class ConfigData:
     """Stores information about a configuration."""
 
     def __init__(
@@ -177,7 +174,7 @@ def __init__(
         self.is_preview = is_preview
 
 
-class ConfigDataManager(object):
+class ConfigDataManager:
     """Loads the information from the various configurations."""
 
     def __init__(
@@ -1196,10 +1193,9 @@ def load_ignored_data(self, config_name):
                                 metomi.rose.config_editor
                                 .WARNING_TYPE_USER_IGNORED
                             )
-                            val = getattr(
-                                metomi.rose.config_editor,
-                                "WARNING_USER_NOT_TRIGGER_IGNORED",
-                            )
+                            val = (
+                                metomi.rose.config_editor
+                            ).WARNING_USER_NOT_TRIGGER_IGNORED
                             node_inst.warning.update({key: val})
                         else:
                             # Doc table: I_u -> I_t -> optional

metomi/rose/config_editor/data_helper.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -27,7 +24,7 @@
 REC_ELEMENT_SECTION = re.compile(r"^(.*)\((.+)\)$")
 
 
-class ConfigDataHelper(object):
+class ConfigDataHelper:
 
     def __init__(self, data, util):
         self.data = data
@@ -42,10 +39,10 @@ def get_config_has_unsaved_changes(self, config_name):
         save_sections = config_data.sections.get_all(
             save=True, skip_latent=True
         )
-        now_set = set([v.to_hashable() for v in variables])
-        save_set = set([v.to_hashable() for v in save_vars])
-        now_sect_set = set([s.to_hashable() for s in sections])
-        save_sect_set = set([s.to_hashable() for s in save_sections])
+        now_set = {v.to_hashable() for v in variables}
+        save_set = {v.to_hashable() for v in save_vars}
+        now_sect_set = {s.to_hashable() for s in sections}
+        save_sect_set = {s.to_hashable() for s in save_sections}
         return (
             config_name not in self.data.saved_config_names
             or now_set ^ save_set
@@ -249,7 +246,7 @@ def get_sections_from_namespace(self, namespace):
         ns_metadata = self.data.namespace_meta_lookup.get(namespace, {})
         sections = ns_metadata.get("sections", [])
         if sections:
-            return [s for s in sections]
+            return list(sections)
         base, subsp = self.util.split_full_ns(self.data, namespace)
         ns_section = subsp.replace("/", ":")
         if ns_section in self.data.config[base].sections.now:

metomi/rose/config_editor/keywidget.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -446,13 +443,12 @@ def _set_show_title(self, should_show_title):
         """Set the display of a variable title instead of the name."""
         if not self.my_variable.name:
             return False
-        if should_show_title:
-            if metomi.rose.META_PROP_TITLE in self.meta:
-                title_string = self._get_metadata_formatting(
-                    metomi.rose.META_PROP_TITLE
-                )
-                if title_string != self.entry.get_text():
-                    return self.entry.set_text(title_string)
+        if should_show_title and metomi.rose.META_PROP_TITLE in self.meta:
+            title_string = self._get_metadata_formatting(
+                metomi.rose.META_PROP_TITLE
+            )
+            if title_string != self.entry.get_text():
+                return self.entry.set_text(title_string)
         if self.entry.get_text() != self.my_variable.name:
             self.entry.set_text(self.my_variable.name)
 
@@ -543,9 +539,8 @@ def _handle_enter(self, event_box):
         if (
             metomi.rose.META_PROP_HELP in self.meta
             or metomi.rose.META_PROP_URL in self.meta
-        ):
-            if isinstance(self.entry, Gtk.Label):
-                self._set_underline(self.entry, underline=True)
+        ) and isinstance(self.entry, Gtk.Label):
+            self._set_underline(self.entry, underline=True)
         return False
 
     def _set_underline(self, label, underline=False):

metomi/rose/config_editor/main.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -76,9 +73,10 @@
 import metomi.rose.opt_parse
 import metomi.rose.resource
 import metomi.rose.macros
+import contextlib
 
 
-class MainController(object):
+class MainController:
     """The main controller class.
 
     Call with a configuration directory and/or a dict of
@@ -916,7 +914,7 @@ def make_page(self, namespace_name):
         )
         # Related pages
         see_also = ""
-        sections = [s for s in ns_metadata.get("sections", [])]
+        sections = list(ns_metadata.get("sections", []))
         for section_name in [s for s in sections if s.startswith("namelist")]:
             no_num_name = metomi.rose.macro.REC_ID_STRIP_DUPL.sub(
                 "", section_name
@@ -1867,7 +1865,7 @@ def get_found_page_and_id(self, expression, start_page):
             current_name = self.util.split_full_ns(self.data, current_ns)[0]
             ns_cmp = lambda x, y: (y == current_ns) - (x == current_ns)
             name_cmp = lambda x, y: (y == current_name) - (x == current_name)
-        config_keys = sorted(list(self.data.config.keys()))
+        config_keys = sorted(self.data.config.keys())
         config_keys.sort(key=cmp_to_key(name_cmp))
         for config_name in config_keys:
             config_data = self.data.config[config_name]
@@ -1890,7 +1888,7 @@ def get_found_page_and_id(self, expression, start_page):
                 if reg_find(variable.name) or reg_find(variable.value):
                     found_ns_vars.setdefault(ns, [])
                     found_ns_vars[ns].append(variable)
-            ns_list = sorted(list(found_ns_vars.keys()))
+            ns_list = sorted(found_ns_vars.keys())
             ns_list.sort(key=cmp_to_key(ns_cmp))
             for ns in ns_list:
                 variables = found_ns_vars[ns]
@@ -1968,10 +1966,8 @@ def perform_undo(self, redo_mode_on=False):
             action = stack_item.action
             node = stack_item.node
             node_id = None
-            try:
+            with contextlib.suppress(AttributeError, KeyError):
                 node_id = node.metadata["id"]
-            except (AttributeError, KeyError):
-                pass
             # We need to handle namespace and metadata changes
             if node_id is None:
                 # Not a variable or section
@@ -1998,7 +1994,7 @@ def perform_undo(self, redo_mode_on=False):
                 and not node_is_section
             ):
                 page = self.view_page(namespace, node_id)
-            redo_items = [x for x in self.redo_stack]
+            redo_items = list(self.redo_stack)
             if stack_item.undo_args:
                 args = list(stack_item.undo_args)
                 for i, arg_item in enumerate(args):
@@ -2237,7 +2233,7 @@ def main():
     if opts.conf_dir:
         os.chdir(opts.conf_dir)
     path = os.getcwd()
-    name_set = set([metomi.rose.SUB_CONFIG_NAME, metomi.rose.TOP_CONFIG_NAME])
+    name_set = {metomi.rose.SUB_CONFIG_NAME, metomi.rose.TOP_CONFIG_NAME}
     while True:
         if set(os.listdir(path)) & name_set:
             break

metomi/rose/config_editor/menu.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 from functools import cmp_to_key
 
 
-class MenuBar(object):
+class MenuBar:
     """Generate the menu bar, using the GTK UIManager.
 
     Parses the settings in 'ui_config_string'. Connection of buttons is done
@@ -491,7 +488,7 @@ def add_macro(
             config_item.get_submenu().prepend(all_item)
 
 
-class MainMenuHandler(object):
+class MainMenuHandler:
     """Handles signals from the main menu and tool bar."""
 
     def __init__(
@@ -651,7 +648,7 @@ def load_page_menu(self, menubar, add_menuitem, current_page):
     def load_macro_menu(self, menubar):
         """Refresh the menu dealing with custom macro launches."""
         menubar.clear_macros()
-        config_keys = sorted(list(self.data.config.keys()))
+        config_keys = sorted(self.data.config.keys())
         for config_name in config_keys:
             image = self.data.helper.get_icon_path_for_config(config_name)
             macros = self.data.config[config_name].macros

metomi/rose/config_editor/menuwidget.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -219,9 +216,8 @@ def _set_hover_over(self, variable):
             for err, err_info in list(variable.error.items()):
                 hover_string += "(" + err + "): " + err_info + "\n"
             hover_string = hover_string.rstrip("\n")
-        if self.is_ghost:
-            if not variable.error:
-                hover_string = metomi.rose.config_editor.VAR_MENU_TIP_LATENT
+        if self.is_ghost and not variable.error:
+            hover_string = metomi.rose.config_editor.VAR_MENU_TIP_LATENT
         self.hover_text = hover_string
         self.button.set_tooltip_text(self.hover_text)
         self.button.show()

metomi/rose/config_editor/nav_controller.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -23,7 +20,7 @@
 import metomi.rose.config_editor
 
 
-class NavTreeManager(object):
+class NavTreeManager:
     """This controls the navigation namespace tree structure."""
 
     def __init__(self, data, util, reporter, tree_trigger_update):

metomi/rose/config_editor/nav_panel.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-# -----------------------------------------------------------------------------
-# Copyright (C) 2012-2020 British Crown (Met Office) & Contributors.
-#
+# Copyright (C) British Crown (Met Office) & Contributors.
 # This file is part of Rose, a framework for meteorological suites.
 #
 # Rose is free software: you can redistribute it and/or modify
@@ -279,13 +276,12 @@ def _set_title_markup(self, column, cell, model, r_iter, index):
             title = metomi.rose.config_editor.TITLE_PAGE_PREVIEW_MARKUP.format(
                 title
             )
-        if latent_status:
-            if self._get_is_latent_sub_tree(model, r_iter):
-                title = (
-                    metomi.rose.config_editor.TITLE_PAGE_LATENT_MARKUP.format(
-                        title
-                    )
+        if latent_status and self._get_is_latent_sub_tree(model, r_iter):
+            title = (
+                metomi.rose.config_editor.TITLE_PAGE_LATENT_MARKUP.format(
+                    title
                 )
+            )
         if ignored_status:
             title = metomi.rose.config_editor.TITLE_PAGE_IGNORED_MARKUP.format(
                 ignored_status, title