Code review

Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com>

Author: cdce8p

doc/data/messages/i/improve-conditionals/bad.py

@@ -1,4 +1,5 @@
-def func(expr, node_cls):
-    # +1:[improve-conditionals]
-    if not isinstance(expr, node_cls) or expr.attrname != "__init__":
-        ...
+def is_penguin(animal):
+    # Penguins are the only flightless, kneeless sea birds
+    return animal.is_seabird() and (
+        not animal.can_fly() or not animal.has_visible_knee()  # [improve-conditionals]
+    )

doc/data/messages/i/improve-conditionals/good.py

@@ -1,3 +1,3 @@
-def func(expr, node_cls):
-    if not (isinstance(expr, node_cls) and expr.attrname == "__init__"):
-        ...
+def is_penguin(animal):
+    # Penguins are the only flightless, kneeless sea birds
+    return animal.is_seabird() and not (animal.can_fly() or animal.has_visible_knee())

doc/user_guide/checkers/extensions.rst

@@ -93,7 +93,9 @@ Code Style checker Messages
   times faster than a float call (after the initial import of math). This check
   also catches typos in float calls as a side effect.
 :improve-conditionals (R6107): *Rewrite conditional expression to '%s'*
-  Rewrite negated if expressions to improve readability.
+  Rewrite negated if expressions to improve readability. This style is simpler
+  and also permits converting long if/elif chains to match case with more ease.
+  Disabled by default!
 
 
 .. _pylint.extensions.comparison_placement:

doc/user_guide/configuration/all-options.rst

@@ -233,7 +233,7 @@ Standard Checkers
 
    confidence = ["HIGH", "CONTROL_FLOW", "INFERENCE", "INFERENCE_FAILURE", "UNDEFINED"]
 
-   disable = ["bad-inline-option", "consider-using-augmented-assign", "deprecated-pragma", "file-ignored", "locally-disabled", "prefer-typing-namedtuple", "raw-checker-failed", "suppressed-message", "use-implicit-booleaness-not-comparison-to-string", "use-implicit-booleaness-not-comparison-to-zero", "use-symbolic-message-instead", "useless-suppression"]
+   disable = ["bad-inline-option", "consider-using-augmented-assign", "deprecated-pragma", "file-ignored", "improve-conditionals", "locally-disabled", "prefer-typing-namedtuple", "raw-checker-failed", "suppressed-message", "use-implicit-booleaness-not-comparison-to-string", "use-implicit-booleaness-not-comparison-to-zero", "use-symbolic-message-instead", "useless-suppression"]
 
    enable = []
 

pylint/extensions/code_style.py

@@ -93,9 +93,11 @@ class CodeStyleChecker(BaseChecker):
         "R6107": (
             "Rewrite conditional expression to '%s'",
             "improve-conditionals",
-            "Rewrite negated if expressions to improve readability.",
+            "Rewrite negated if expressions to improve readability. This style is simpler "
+            "and also permits converting long if/elif chains to match case with more ease.\n"
+            "Disabled by default!",
             {
-                # "default_enabled": False,
+                "default_enabled": False,
             },
         ),
     }

pylint/extensions/private_import.py

@@ -108,7 +108,7 @@ def _name_is_private(name: str) -> bool:
         return (
             bool(name)
             and name[0] == "_"
-            and not (len(name) > 4 and name[:2] == "__" and name[-2:] == "__")
+            and not (len(name) > 4 and name[1] == "_" and name[-2:] == "__")
         )
 
     def _get_type_annotation_names(