Cover more lines (#7996)

Author: nickdrozd

pylint/extensions/docparams.py

@@ -332,9 +332,7 @@ def visit_return(self, node: nodes.Return) -> None:
         if self.linter.config.accept_no_return_doc:
             return
 
-        func_node = node.frame(future=True)
-        if not isinstance(func_node, astroid.FunctionDef):
-            return
+        func_node: astroid.FunctionDef = node.frame(future=True)
 
         # skip functions that match the 'no-docstring-rgx' config option
         no_docstring_rgx = self.linter.config.no_docstring_rgx
@@ -360,9 +358,7 @@ def visit_yield(self, node: nodes.Yield | nodes.YieldFrom) -> None:
         if self.linter.config.accept_no_yields_doc:
             return
 
-        func_node = node.frame(future=True)
-        if not isinstance(func_node, astroid.FunctionDef):
-            return
+        func_node: astroid.FunctionDef = node.frame(future=True)
 
         # skip functions that match the 'no-docstring-rgx' config option
         no_docstring_rgx = self.linter.config.no_docstring_rgx

tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.py

@@ -23,6 +23,11 @@ class Foo:
     "entry_2": {0: None, 1: None},
 }
 
+# Subdicts have no common keys
+MAPPING_4 = {
+    "entry_1": {"key_3": 0, "key_4": 1, "key_diff_1": 2},
+    "entry_2": {"key_1": 0, "key_2": 1, "key_diff_2": 3},
+}
 
 def func():
     # Not in module scope

tests/functional/ext/code_style/cs_consider_using_namedtuple_or_dataclass.txt

@@ -1,5 +1,5 @@
 consider-using-namedtuple-or-dataclass:11:12:14:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED
 consider-using-namedtuple-or-dataclass:15:12:18:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED
-consider-using-namedtuple-or-dataclass:34:23:37:5:func:Consider using namedtuple or dataclass for dictionary values:UNDEFINED
-consider-using-namedtuple-or-dataclass:41:12:44:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED
-consider-using-namedtuple-or-dataclass:53:12:56:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED
+consider-using-namedtuple-or-dataclass:39:23:42:5:func:Consider using namedtuple or dataclass for dictionary values:UNDEFINED
+consider-using-namedtuple-or-dataclass:46:12:49:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED
+consider-using-namedtuple-or-dataclass:58:12:61:1::Consider using namedtuple or dataclass for dictionary values:UNDEFINED

tests/functional/ext/consider_ternary_expression/consider_ternary_expression.py

@@ -1,3 +1,6 @@
+# pylint: disable=invalid-name, undefined-variable, unused-variable, missing-function-docstring, missing-module-docstring
+# pylint: disable=unsupported-assignment-operation, line-too-long
+
 if f():  # [consider-ternary-expression]
     x = 4
 else:
@@ -15,3 +18,19 @@ def a():
         z = 4
     else:
         z = 5
+
+if f():
+    x = 4
+    print(x)
+else:
+    x = 5
+
+if f():
+    x[0] = 4
+else:
+    x = 5
+
+if f():
+    x = 4
+else:
+    y = 5

tests/functional/ext/consider_ternary_expression/consider_ternary_expression.rc

@@ -1,10 +1,2 @@
 [MAIN]
 load-plugins=pylint.extensions.consider_ternary_expression,
-
-[MESSAGES CONTROL]
-disable=
-  invalid-name,
-  undefined-variable,
-  unused-variable,
-  missing-function-docstring,
-  missing-module-docstring,

tests/functional/ext/consider_ternary_expression/consider_ternary_expression.txt

@@ -1,2 +1,2 @@
-consider-ternary-expression:1:0:4:9::Consider rewriting as a ternary expression:UNDEFINED
-consider-ternary-expression:14:4:17:13:a:Consider rewriting as a ternary expression:UNDEFINED
+consider-ternary-expression:4:0:7:9::Consider rewriting as a ternary expression:UNDEFINED
+consider-ternary-expression:17:4:20:13:a:Consider rewriting as a ternary expression:UNDEFINED

tests/functional/ext/docparams/docparams.py

@@ -102,3 +102,7 @@ def params_are_documented(par1: int, *, par2: int) -> int:
     """
 
     return par1 + par2
+
+
+# Only check raise nodes within FunctionDefs
+raise Exception()

tests/functional/ext/private_import/private_import.py

@@ -137,3 +137,6 @@ def save(self):
 # Treat relative imports as internal
 from .other_file import _private
 from ..parent import _private
+
+from _private_module_x import some_name # [import-private-name]
+var = some_name

tests/functional/ext/private_import/private_import.txt

@@ -18,3 +18,4 @@ import-private-name:107:0:107:41::Imported private module (_private_module5):HIG
 import-private-name:111:0:111:42::Imported private module (_private_module6):HIGH
 import-private-name:114:0:114:40::Imported private object (_PrivateClass3):HIGH
 import-private-name:119:0:119:34::Imported private module (_private_module_unreachable):HIGH
+import-private-name:141:0:141:39::Imported private module (_private_module_x):HIGH