Improved readability

Author: yushao2

pylint/checkers/refactoring/recommendation_checker.py

@@ -153,6 +153,7 @@ def _check_consider_using_dict_items(self, node: astroid.For) -> None:
 
                 if not isinstance(subscript.value, (astroid.Name, astroid.Attribute)):
                     continue
+
                 value = subscript.slice
                 if isinstance(value, astroid.Index):
                     value = value.value
@@ -186,14 +187,17 @@ def visit_comprehension(self, node: astroid.Comprehension) -> None:
         iterating_object_name = utils.get_iterating_dictionary_name(node)
         if iterating_object_name is None:
             return
+
         children = list(node.parent.get_children())
         if node.ifs:
             children.extend(node.ifs)
         for child in children:
             for subscript in child.nodes_of_class(astroid.Subscript):
                 subscript = cast(astroid.Subscript, subscript)
+
                 if not isinstance(subscript.value, (astroid.Name, astroid.Attribute)):
                     continue
+
                 value = subscript.slice
                 if isinstance(value, astroid.Index):
                     value = value.value

pylint/checkers/utils.py

@@ -1504,18 +1504,21 @@ def get_iterating_dictionary_name(
     or a dictionary itself, this returns None.
     """
     # Is it a proper keys call?
-    is_iterating_dict_keys = (
+    if (
         isinstance(node.iter, astroid.Call)
         and isinstance(node.iter.func, astroid.Attribute)
         and node.iter.func.attrname == "keys"
-        and isinstance(safe_infer(node.iter.func), astroid.BoundMethod)
-    )
-    # Is it a proper dictionary?
-    is_iterating_dict = isinstance(
-        node.iter, (astroid.Name, astroid.Attribute)
-    ) and isinstance(safe_infer(node.iter), astroid.Dict)
+    ):
+        inferred = safe_infer(node.iter.func)
+        if not isinstance(inferred, astroid.BoundMethod):
+            return None
+        return node.iter.as_string().rpartition(".keys")[0]
 
-    if is_iterating_dict or is_iterating_dict_keys:
-        return node.iter.as_string().partition(".keys")[0]
+    # Is it a dictionary?
+    if isinstance(node.iter, (astroid.Name, astroid.Attribute)):
+        inferred = safe_infer(node.iter)
+        if not isinstance(inferred, astroid.Dict):
+            return None
+        return node.iter.as_string()
 
     return None

tests/functional/c/consider/consider_using_dict_items.py

@@ -83,4 +83,4 @@ class Foo:
 val = any(True for k8 in Foo.c_dict if c_dict[k8])
 
 # Should emit warning, using .keys() of Foo.c_dict
-val = any(True for k8 in Foo.c_dict.keys() if Foo.c_dict[k8]) # [consider-iterating-dictionary,consider-using-dict-items]
+val = any(True for k8 in Foo.c_dict.keys() if Foo.c_dict[k8])  # [consider-iterating-dictionary,consider-using-dict-items]