Capgen cleanup

scripts/ccpp_database_obj.py

@@ -18,7 +18,7 @@ def __init__(self, message):
         super().__init__(message)
 
 class CCPPDatabaseObj:
-    """Ojbect with data and methods to provide information from a run of capgen.
+    """Object with data and methods to provide information from a run of capgen.
     """
 
     def __init__(self, run_env, host_model=None, api=None, database_file=None):
@@ -56,7 +56,7 @@ def db_from_file(self, run_env, database_file):
               datatable.xml file created by capgen.
         """
         metadata_tables = {}
-        host_name = "cam"
+        host_name = "host"
         self.__host_model = HostModel(metadata_tables, host_name, run_env)
         self.__api = API(sdfs, host_model, scheme_headers, run_env)
         raise CCPPDatabaseObjError("ERROR: <database_file> not supported")

scripts/metavar.py

@@ -1427,7 +1427,7 @@ def __init__(self, name, run_env, variables=None,
                 self[stdname] = variables[key]
             # end for
         elif variables is not None:
-            raise ParseInternalError('Illegal type for variables, {} in {}'.format(type_name(variables), self.name))
+            raise ParseInternalError(f'Illegal type for variables, {type_name(variables)} in {self.name}')
         # end if
 
     @property
@@ -1623,15 +1623,13 @@ def add_variable_dimensions(self, var, ignore_sources, to_dict=None,
                     else:
                         ctx = context_string(var.context)
                     # end if
-                    err_ret += "{}: ".format(self.name)
-                    err_ret += "Cannot find variable for dimension, {}, of {}{}"
                     vstdname = var.get_prop_value('standard_name')
-                    err_ret = err_ret.format(dimname, vstdname, ctx)
+                    err_ret += f"{self.name}: "
+                    err_ret += f"Cannot find variable for dimension, {dimname}, of {vstdname}{ctx}"
                     if dvar:
-                        err_ret += "\nFound {} from excluded source, '{}'{}"
+                        err_ret += f"\nFound {lname} from excluded source, '{dvar.source.ptype}'{dctx}"
                         lname = dvar.get_prop_value('local_name')
                         dctx = context_string(dvar.context)
-                        err_ret = err_ret.format(lname, dvar.source.ptype, dctx)
                     # end if
                 # end if
             # end if

scripts/parse_tools/parse_checkers.py

@@ -12,7 +12,13 @@
 
 ########################################################################
 
-_UNITS_RE = re.compile(r"^[^/!@#$%^&*=()\|<>\[\]{}?,.]+$")
+_UNITLESS_REGEX                = "1"
+_NON_LEADING_ZERO_NUM          = "[1-9]\d*"
+_NEGATIVE_NON_LEADING_ZERO_NUM = f"[-]{_NON_LEADING_ZERO_NUM}"
+_UNIT_EXPONENT                 = f"({_NEGATIVE_NON_LEADING_ZERO_NUM}|{_NON_LEADING_ZERO_NUM})"
+_UNIT_REGEX                    = f"[a-zA-Z]+{_UNIT_EXPONENT}?"
+_UNITS_REGEX                   = f"^({_UNIT_REGEX}(\s{_UNIT_REGEX})*|{_UNITLESS_REGEX})$"
+_UNITS_RE                      = re.compile(_UNITS_REGEX)
 
 def check_units(test_val, prop_dict, error):
     """Return <test_val> if a valid unit, otherwise, None