Iterate dictionary directly

ema_workbench/em_framework/outcomes.py

@@ -197,7 +197,7 @@ def __eq__(self, other):
             all(
                 hasattr(self, key) == hasattr(other, key)
                 and getattr(self, key) == getattr(other, key)
-                for key in self.__dict__.keys()
+                for key in self.__dict__
             ),
             self.__class__ == other.__class__,
         ]

ema_workbench/examples/eijgenraam_example.py

@@ -112,7 +112,7 @@
     52: (49.2200, 1.6075, 0.0047, 0.036173, 0.304, 0.001716, 4025.6, 0.00171, 1 / 1250),
     53: (69.4565, 1.1625, 0.0028, 0.031651, 0.336, 0.002700, 9819.5, 0.00171, 1 / 1250),
 }
-data = {i: {k: v for k, v in zip(params, raw_data[i])} for i in raw_data.keys()}
+data = {i: {k: v for k, v in zip(params, raw_data[i])} for i in raw_data}
 
 # Set the ring we are analyzing
 ring = 15

test/test_em_framework/test_callback.py

@@ -87,7 +87,7 @@ def test_store_results(self):
 
         _, out = callback.get_results()
 
-        self.assertIn(outcomes[0].name, {entry for entry in out.keys()})
+        self.assertIn(outcomes[0].name, {entry for entry in out})
         self.assertEqual(out[outcomes[0].name].shape, (3,))
 
         # case 2 time series shape = (1, nr_time_steps)

test/test_em_framework/test_util.py

@@ -44,7 +44,7 @@ def test_namedict(self):
         self.assertEqual(2, len(nd), "length not correct")
 
         # test in
-        for entry in kwargs.keys():
+        for entry in kwargs:
             self.assertIn(entry, nd, f"{entry} not in NamedDict")
 
         # test addition