pylint: fix consider-using-dict-items cases

Fix all cases of C0206 consider-using-dict-items.

Part of #270

Author: DifferentialOrange

tarantool/connection_pool.py

@@ -663,9 +663,7 @@ def connect(self):
         and refresh the info would be processed in the background.
         """
 
-        for key in self.pool:
-            unit = self.pool[key]
-
+        for key, unit in self.pool.items():
             self._refresh_state(key)
             last_refresh = time.time()
 

tarantool/msgpack_ext/interval.py

@@ -65,8 +65,7 @@ def encode(obj, _):
     buf = bytes()
 
     count = 0
-    for field_id in id_map.keys():
-        field_name = id_map[field_id]
+    for field_id, field_name in id_map.items():
         value = getattr(obj, field_name)
 
         if field_name == 'adjust':

tarantool/msgpack_ext/types/interval.py

@@ -219,8 +219,7 @@ def __eq__(self, other):
         # - false
         # ...
 
-        for field_id in id_map.keys():
-            field_name = id_map[field_id]
+        for _, field_name in id_map.items():
             if getattr(self, field_name) != getattr(other, field_name):
                 return False
 

test/suites/lib/skip.py

@@ -115,7 +115,7 @@ def wrapper(self, *args, **kwargs):
             func(self, *args, **kwargs)
 
         ver = sys.version_info
-        python_version_str = '%d.%d' % (ver.major, ver.minor)
+        python_version_str = f'{ver.major}.{ver.minor}'
         python_version = pkg_resources.parse_version(python_version_str)
         support_version = pkg_resources.parse_version(required_python_version)
         if python_version < support_version:

test/suites/test_crud.py

@@ -716,30 +716,27 @@ def _exception_operation_with_crud(self, testing_function, case, mode=None):
                     self.assertEqual(exc.success_list.rows, case['error']['output']['res_rows'])
 
     def test_crud_module_via_connection(self):
-        for case_name in self.crud_test_cases.keys():
-            with self.subTest(name=case_name):
-                case = self.crud_test_cases[case_name]
-                testing_function = getattr(self.conn, case_name)
+        for name, case in self.crud_test_cases.items():
+            with self.subTest(name=name):
+                testing_function = getattr(self.conn, name)
                 # Correct try testing.
                 self._correct_operation_with_crud(testing_function, case)
                 # Exception try testing.
                 self._exception_operation_with_crud(testing_function, case)
 
     def test_crud_module_via_mesh_connection(self):
-        for case_name in self.crud_test_cases.keys():
-            with self.subTest(name=case_name):
-                case = self.crud_test_cases[case_name]
-                testing_function = getattr(self.conn_mesh, case_name)
+        for name, case in self.crud_test_cases.items():
+            with self.subTest(name=name):
+                testing_function = getattr(self.conn_mesh, name)
                 # Correct try testing.
                 self._correct_operation_with_crud(testing_function, case)
                 # Exception try testing.
                 self._exception_operation_with_crud(testing_function, case)
 
     def test_crud_module_via_pool_connection(self):
-        for case_name in self.crud_test_cases.keys():
-            with self.subTest(name=case_name):
-                case = self.crud_test_cases[case_name]
-                testing_function = getattr(self.conn_pool, case_name)
+        for name, case in self.crud_test_cases.items():
+            with self.subTest(name=name):
+                testing_function = getattr(self.conn_pool, name)
                 # Correct try testing.
                 self._correct_operation_with_crud(testing_function, case, mode=tarantool.Mode.RW)
                 # Exception try testing.

test/suites/test_datetime.py

@@ -140,9 +140,8 @@ def test_datetime_class_api_wth_tz(self):
     }
 
     def test_datetime_class_invalid_init(self):
-        for name in self.datetime_class_invalid_init_cases.keys():
+        for name, case in self.datetime_class_invalid_init_cases.items():
             with self.subTest(msg=name):
-                case = self.datetime_class_invalid_init_cases[name]
                 self.assertRaisesRegex(
                     case['type'], re.escape(case['msg']),
                     lambda: tarantool.Datetime(*case['args'], **case['kwargs']))
@@ -279,38 +278,30 @@ def test_datetime_class_invalid_init(self):
     }
 
     def test_msgpack_decode(self):
-        for name in self.integration_cases.keys():
+        for name, case in self.integration_cases.items():
             with self.subTest(msg=name):
-                case = self.integration_cases[name]
-
                 self.assertEqual(unpacker_ext_hook(4, case['msgpack']),
                                  case['python'])
 
     @skip_or_run_datetime_test
     def test_tarantool_decode(self):
-        for name in self.integration_cases.keys():
+        for name, case in self.integration_cases.items():
             with self.subTest(msg=name):
-                case = self.integration_cases[name]
-
                 self.adm(f"box.space['test']:replace{{'{name}', {case['tarantool']}, 'field'}}")
 
                 self.assertSequenceEqual(self.con.select('test', name),
                                          [[name, case['python'], 'field']])
 
     def test_msgpack_encode(self):
-        for name in self.integration_cases.keys():
+        for name, case in self.integration_cases.items():
             with self.subTest(msg=name):
-                case = self.integration_cases[name]
-
                 self.assertEqual(packer_default(case['python']),
                                  msgpack.ExtType(code=4, data=case['msgpack']))
 
     @skip_or_run_datetime_test
     def test_tarantool_encode(self):
-        for name in self.integration_cases.keys():
+        for name, case in self.integration_cases.items():
             with self.subTest(msg=name):
-                case = self.integration_cases[name]
-
                 self.con.insert('test', [name, case['python'], 'field'])
 
                 lua_eval = f"""
@@ -370,18 +361,14 @@ def test_msgpack_decode_ambiguous_tzindex(self):
     }
 
     def test_python_datetime_subtraction(self):
-        for name in self.datetime_subtraction_cases.keys():
+        for name, case in self.datetime_subtraction_cases.items():
             with self.subTest(msg=name):
-                case = self.datetime_subtraction_cases[name]
-
                 self.assertEqual(case['arg_1'] - case['arg_2'], case['res'])
 
     @skip_or_run_datetime_test
     def test_tarantool_datetime_subtraction(self):
-        for name in self.datetime_subtraction_cases.keys():
+        for name, case in self.datetime_subtraction_cases.items():
             with self.subTest(msg=name):
-                case = self.datetime_subtraction_cases[name]
-
                 self.assertSequenceEqual(self.con.call('sub', case['arg_1'], case['arg_2']),
                                          [case['res']])
 
@@ -490,34 +477,26 @@ def test_tarantool_datetime_subtraction_different_timezones(self):
     }
 
     def test_python_datetime_addition(self):
-        for name in self.interval_arithmetic_cases.keys():
+        for name, case in self.interval_arithmetic_cases.items():
             with self.subTest(msg=name):
-                case = self.interval_arithmetic_cases[name]
-
                 self.assertEqual(case['arg_1'] + case['arg_2'], case['res_add'])
 
     def test_python_datetime_subtraction(self):
-        for name in self.interval_arithmetic_cases.keys():
+        for name, case in self.interval_arithmetic_cases.items():
             with self.subTest(msg=name):
-                case = self.interval_arithmetic_cases[name]
-
                 self.assertEqual(case['arg_1'] - case['arg_2'], case['res_sub'])
 
     @skip_or_run_datetime_test
     def test_tarantool_datetime_addition(self):
-        for name in self.interval_arithmetic_cases.keys():
+        for name, case in self.interval_arithmetic_cases.items():
             with self.subTest(msg=name):
-                case = self.interval_arithmetic_cases[name]
-
                 self.assertSequenceEqual(self.con.call('add', case['arg_1'], case['arg_2']),
                                          [case['res_add']])
 
     @skip_or_run_datetime_test
     def test_tarantool_datetime_subtraction(self):
-        for name in self.interval_arithmetic_cases.keys():
+        for name, case in self.interval_arithmetic_cases.items():
             with self.subTest(msg=name):
-                case = self.interval_arithmetic_cases[name]
-
                 self.assertSequenceEqual(self.con.call('sub', case['arg_1'], case['arg_2']),
                                          [case['res_sub']])
 

test/suites/test_decimal.py

@@ -224,39 +224,31 @@ def setUp(self):
     }
 
     def test_msgpack_decode(self):
-        for name in self.valid_cases.keys():
+        for name, case in self.valid_cases.items():
             with self.subTest(msg=name):
-                case = self.valid_cases[name]
-
                 self.assertEqual(unpacker_ext_hook(1, case['msgpack']),
                                  case['python'])
 
     @skip_or_run_decimal_test
     def test_tarantool_decode(self):
-        for name in self.valid_cases.keys():
+        for name, case in self.valid_cases.items():
             with self.subTest(msg=name):
-                case = self.valid_cases[name]
-
                 self.adm(f"box.space['test']:replace{{'{name}', {case['tarantool']}}}")
 
                 self.assertSequenceEqual(
                     self.con.select('test', name),
                     [[name, case['python']]])
 
     def test_msgpack_encode(self):
-        for name in self.valid_cases.keys():
+        for name, case in self.valid_cases.items():
             with self.subTest(msg=name):
-                case = self.valid_cases[name]
-
                 self.assertEqual(packer_default(case['python']),
                                  msgpack.ExtType(code=1, data=case['msgpack']))
 
     @skip_or_run_decimal_test
     def test_tarantool_encode(self):
-        for name in self.valid_cases.keys():
+        for name, case in self.valid_cases.items():
             with self.subTest(msg=name):
-                case = self.valid_cases[name]
-
                 self.con.insert('test', [name, case['python']])
 
                 lua_eval = f"""
@@ -303,10 +295,8 @@ def test_tarantool_encode(self):
     }
 
     def test_msgpack_encode_error(self):
-        for name in self.error_cases.keys():
+        for name, case in self.error_cases.items():
             with self.subTest(msg=name):
-                case = self.error_cases[name]
-
                 msg = 'Decimal cannot be encoded: Tarantool decimal ' + \
                       'supports a maximum of 38 digits.'
                 self.assertRaisesRegex(
@@ -315,10 +305,8 @@ def test_msgpack_encode_error(self):
 
     @skip_or_run_decimal_test
     def test_tarantool_encode_error(self):
-        for name in self.error_cases.keys():
+        for name, case in self.error_cases.items():
             with self.subTest(msg=name):
-                case = self.error_cases[name]
-
                 msg = 'Decimal cannot be encoded: Tarantool decimal ' + \
                       'supports a maximum of 38 digits.'
                 self.assertRaisesRegex(
@@ -384,10 +372,8 @@ def test_tarantool_encode_error(self):
     }
 
     def test_msgpack_encode_with_precision_loss(self):
-        for name in self.precision_loss_cases.keys():
+        for name, case in self.precision_loss_cases.items():
             with self.subTest(msg=name):
-                case = self.precision_loss_cases[name]
-
                 msg = 'Decimal encoded with loss of precision: ' + \
                       'Tarantool decimal supports a maximum of 38 digits.'
 
@@ -402,10 +388,8 @@ def test_msgpack_encode_with_precision_loss(self):
 
     @skip_or_run_decimal_test
     def test_tarantool_encode_with_precision_loss(self):
-        for name in self.precision_loss_cases.keys():
+        for name, case in self.precision_loss_cases.items():
             with self.subTest(msg=name):
-                case = self.precision_loss_cases[name]
-
                 msg = 'Decimal encoded with loss of precision: ' + \
                       'Tarantool decimal supports a maximum of 38 digits.'
 

test/suites/test_error_ext.py

@@ -262,9 +262,8 @@ def setUp(self):
 
 
     def test_msgpack_decode(self):
-        for name in self.cases.keys():
+        for name, case in self.cases.items():
             with self.subTest(msg=name):
-                case = self.cases[name]
                 conn = getattr(self, case['conn'])
 
                 self.assertEqual(
@@ -277,9 +276,8 @@ def test_msgpack_decode(self):
 
     @skip_or_run_error_ext_type_test
     def test_tarantool_decode(self):
-        for name in self.cases.keys():
+        for name, case in self.cases.items():
             with self.subTest(msg=name):
-                case = self.cases[name]
                 conn = getattr(self, case['conn'])
 
                 self.adm(f"""
@@ -323,19 +321,17 @@ def test_tarantool_decode(self):
 
 
     def test_msgpack_encode(self):
-        for name in self.cases.keys():
+        for name, case in self.cases.items():
             with self.subTest(msg=name):
-                case = self.cases[name]
                 conn = getattr(self, case['conn'])
 
                 self.assertEqual(packer_default(case['python'], conn._packer_factory()),
                                  msgpack.ExtType(code=3, data=case['msgpack']))
 
     @skip_or_run_error_ext_type_test
     def test_tarantool_encode(self):
-        for name in self.cases.keys():
+        for name, case in self.cases.items():
             with self.subTest(msg=name):
-                case = self.cases[name]
                 conn = getattr(self, case['conn'])
 
                 conn.insert(