Merge pull request #1222 from linsword13/simplify-iter

Simplify iterations when applicable

Author: douglasjacobsen

lib/ramble/ramble/cmd/common/info.py

@@ -166,12 +166,12 @@ def _unpack_when_set_if_needed(internal_attr: dict):
         if isinstance(first_val, dict):
             # unpack to a list of dicts so dicts with same keys don't overwrite
             unpacked_dict = []
-            for when_key, inner_dict in internal_attr.items():
+            for inner_dict in internal_attr.values():
                 unpacked_dict.append(inner_dict)
             return unpacked_dict
         elif isinstance(first_val, list):
             unpacked_list = []
-            for when_key, inner_list in internal_attr.items():
+            for inner_list in internal_attr.values():
                 unpacked_list.extend(inner_list)
             return unpacked_list
         else:
@@ -291,8 +291,8 @@ def _print_figures_of_merit(obj, attr, verbose=False, pattern="*", format=suppor
 
     indentation = " " * 4
 
-    for _, context_dict in internal_attr.items():
-        for _, fom_dict in context_dict.items():
+    for context_dict in internal_attr.values():
+        for fom_dict in context_dict.values():
             if not verbose:
                 to_print = list(fom_dict.keys())
 

lib/ramble/ramble/config.py

@@ -869,8 +869,8 @@ def add_from_file(filename, scope=None):
 
     # update all sections from config dict
     # We have to iterate on keys to keep overrides from the file
-    for section in data.keys():
-        if section in section_schemas.keys():
+    for section in data:
+        if section in section_schemas:
             # Special handling for compiler scope difference
             # Has to be handled after we choose a section
             if scope is None:

lib/ramble/ramble/language/application_language.py

@@ -115,7 +115,7 @@ def _execute_workload_groups(app):
 
         # Apply any existing variables in the group to the workload
         for workload in workloads:
-            for when_set in app.workloads.keys():
+            for when_set in app.workloads:
                 if workload in app.workloads[when_set]:
                     if name in app.workload_group_vars:
                         for var in app.workload_group_vars[name]:

lib/ramble/ramble/pipeline.py

@@ -641,13 +641,13 @@ def print_archive_files(app_inst, pattern_title, patterns):
             for log in analysis_logs:
                 logger.all_msg(f"    - {log}")
 
-            print_archive_files(app_inst, "application", app_inst.archive_patterns.keys())
+            print_archive_files(app_inst, "application", app_inst.archive_patterns)
             if app_inst.package_manager:
                 pm_name = app_inst.package_manager.name
                 print_archive_files(
                     app_inst,
                     f"package manager {pm_name}",
-                    app_inst.package_manager.archive_patterns.keys(),
+                    app_inst.package_manager.archive_patterns,
                 )
 
             for mod in app_inst._modifier_instances:

lib/ramble/ramble/reports.py

@@ -124,7 +124,7 @@ def prepare_data(results: dict, where_query) -> pd.DataFrame:
                     exp_copy.pop("CONTEXTS")
                     exp_copy[ReportVars.CONTEXT.value] = context["name"]
                     for name, val in fom.items():
-                        if name in _FOM_DICT_MAPPING.keys():
+                        if name in _FOM_DICT_MAPPING:
                             exp_copy[_FOM_DICT_MAPPING[name]] = val
                         elif name == "fom_type":
                             exp_copy["fom_type"] = FomType.from_str(fom["fom_type"]["name"])

lib/ramble/ramble/util/env.py

@@ -51,8 +51,8 @@ def _get_env_append_commands(var_conf, expander, var_set, shell="sh"):
         if "var-separator" in append_group:
             sep = append_group["var-separator"]
 
-        for group in append_funcs.keys():
-            if group in append_group.keys():
+        for group in append_funcs:
+            if group in append_group:
                 for var, val in append_group[group].items():
                     expanded_var = expander.expand_var(var)
                     if expanded_var not in var_set:
@@ -75,7 +75,7 @@ def _get_env_prepend_commands(var_conf, expander, var_set, shell="sh"):
     var_set_orig = var_set.copy()
 
     for prepend_group in var_conf:
-        for group in prepend_group.keys():
+        for group in prepend_group:
             for var, val in prepend_group[group].items():
                 expanded_var = expander.expand_var(var)
                 if expanded_var not in var_set:

var/ramble/repos/builtin/base_classes/application-base/base_class.py

@@ -500,7 +500,7 @@ def set_env_variable_sets(self, env_variable_sets):
             add = True
             for env_var_set in self._env_variable_sets:
                 if action in env_var_set:
-                    if env_var.name in env_var_set[action].keys():
+                    if env_var.name in env_var_set[action]:
                         add = False
 
             if add:

var/ramble/repos/builtin/base_classes/modifier-base/base_class.py

@@ -248,14 +248,14 @@ def apply_executable_modifiers(
         return pre_execs, post_execs
 
     def all_env_var_modifications(self):
-        for when_set, env_var_mods in self.env_var_modifications.items():
+        for when_set in self.env_var_modifications:
             if not self.expander.satisfies(when_set, self.object_variants):
                 continue
 
             yield from self.env_var_modifications[when_set].items()
 
     def all_package_manager_requirements(self):
-        for when_set, reqs in self.package_manager_requirements.items():
+        for when_set in self.package_manager_requirements:
             if not self.expander.satisfies(when_set, self.object_variants):
                 continue
 

var/ramble/repos/builtin/base_classes/package-manager-base/base_class.py

@@ -66,7 +66,7 @@ def __init__(self, file_path):
 
         if getattr(self, "families", None) is None:
             self.families = ramble.definitions.families.Families(
-                self.origin_type, list(self.class_families.keys())
+                self.origin_type, list(self.class_families)
             )
 
         ramble.util.class_attributes.convert_class_attributes(self)