Merge pull request #1490 from ESMCI/jgfouca/fix_pylint_errs

Fix pylint errors
Also, add logging-format-interpolation to list of pylint warnings we don't care about. That way, we can use python3 string formatting without getting warnings.

Test suite: code_checker
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?: None

Code review: @JEdwards

scripts/lib/CIME/XML/compsets.py

@@ -80,10 +80,10 @@ def get_value(self, name, attribute=None, resolved=False, subgroup=None):
                 compsets[alias] = lname
             return compsets
 
-    def print_values(self, help=True):
+    def print_values(self, arg_help=True):
         help_text = self.get_value(name="help")
         compsets_text = self.get_value("names")
-        if help:
+        if arg_help:
             logger.info(" {} ".format(help_text))
 
         logger.info("       --------------------------------------")

scripts/lib/CIME/code_checker.py

@@ -16,7 +16,7 @@ def _run_pylint(on_file, interactive):
 ###############################################################################
     pylint = find_executable("pylint")
 
-    cmd_options = " --disable=I,C,R,logging-not-lazy,wildcard-import,unused-wildcard-import,fixme,broad-except,bare-except,eval-used,exec-used,global-statement"
+    cmd_options = " --disable=I,C,R,logging-not-lazy,wildcard-import,unused-wildcard-import,fixme,broad-except,bare-except,eval-used,exec-used,global-statement,logging-format-interpolation"
     cimeroot = get_cime_root()
 
     if "scripts/Tools" in on_file:

scripts/query_config

@@ -8,15 +8,15 @@ information will be listed for each.
 
 from Tools.standard_script_setup import *
 
-from CIME.utils         import expect, get_model
+from CIME.utils         import expect
 from CIME.XML.files     import Files
 from CIME.XML.component import Component
 from CIME.XML.compsets  import Compsets
 from CIME.XML.grids     import Grids
 #from CIME.XML.machines  import Machines
 import CIME.XML.machines
 
-import re, socket, argparse, doctest
+import re, argparse, doctest
 
 ###############################################################################
 def query_grids(long_output):
@@ -52,11 +52,10 @@ def query_compsets(name):
     # Determine valid component values by checking the value attributes for COMPSETS_SPEC_FILE
     files, components = get_compsets()
     match_found = None
-    all = False
+    all_components = False
     if re.search("^all$", name):  # print all compsets
-        model = get_model()
         match_found = name
-        all = True
+        all_components = True
     else:
         for component in components:
             if component == name:
@@ -67,23 +66,23 @@ def query_compsets(name):
     expect(match_found is not None,
            "Invalid input argument {}, valid input arguments are {}".format(name, components))
 
-    if all:  # print all compsets
+    if all_components:  # print all compsets
         for component in components:
-            # the all flag will only print available components
-            print_compset(component, files, all=all)
+            # the all_components flag will only print available components
+            print_compset(component, files, all_components=all_components)
     else:
         print_compset(name, files)
 
-def print_compset(name, files, all=False):
+def print_compset(name, files, all_components=False):
     '''
-    print compsets associated with the component name, but if all is true only
+    print compsets associated with the component name, but if all_components is true only
     print the details if the associated component is available
     '''
 
     # Determine the config_file for the target component
     config_file = files.get_value("COMPSETS_SPEC_FILE", attribute={"component":name})
     # only error out if we aren't printing all otherwise exit quitely
-    if not all:
+    if not all_components:
         expect((config_file),
             "Cannot find any config_component.xml file for {}".format(name))
 
@@ -98,7 +97,7 @@ def print_compset(name, files, all=False):
     # determine component xml content
     compsets = Compsets(config_file)
     # print compsets associated with component without help text
-    compsets.print_values(help=False)
+    compsets.print_values(arg_help=False)
 
 def query_all_components():
     files, components = get_components()
@@ -109,10 +108,10 @@ def query_all_components():
         # determine all components in string
         components = files.get_components(string)
         for item in components:
-            query_component(item, all=True)
+            query_component(item, all_components=True)
 
 ###############################################################################
-def query_component(name, all=False):
+def query_component(name, all_components=False):
 ###############################################################################
 
     # Determine the valid component classes (e.g. atm) for the driver/cpl
@@ -138,10 +137,10 @@ def query_component(name, all=False):
             config_exists = os.path.isfile(config_file)
             break
 
-    if not all and not config_exists:
+    if not all_components and not config_exists:
         expect(config_exists,
                "Cannot find config_file {} on disk".format(config_file))
-    elif all and not config_exists:
+    elif all_components and not config_exists:
         print "WARNING: Couldn't find config_file {} on disk".format(config_file)
         return
     # If name is not a valid argument - exit with error
@@ -268,7 +267,7 @@ class ArgumentParser(argparse.ArgumentParser):
 # we overide print_values from Machines to add current in machine description
 class Machines(CIME.XML.machines.Machines):
 
-    def print_values(self, machine_name='all'):
+    def print_values(self, machine_name='all'): # pylint: disable=arguments-differ
         # set flag to look for single machine
         if 'all' not in machine_name:
             single_machine = True