Merge branch 'master' into fix/len_as_condition

Author: PCManticore

CONTRIBUTORS.txt

@@ -279,3 +279,5 @@ contributors:
 * Goudcode: contributor
 
 * Paul Renvoise : contributor
+
+* Bluesheeptoken: contributor

ChangeLog

@@ -44,6 +44,10 @@ Release date: TBA
 
 * Relicense logo material under the CC BY-SA 4.0 license.
 
+* Skip `if` expressions from f-strings for the `check_elif` checker
+
+  Close #2816
+
 
 What's New in Pylint 2.3.0?
 ===========================

pylint/checkers/python3.py

@@ -438,7 +438,7 @@ class Python3Checker(checkers.BaseChecker):
             "range built-in referenced when not iterating",
             "range-builtin-not-iterating",
             "Used when the range built-in is referenced in a non-iterating "
-            "context (returns an iterator in Python 3)",
+            "context (returns a range in Python 3)",
         ),
         "W1639": (
             "filter built-in referenced when not iterating",

pylint/extensions/check_elif.py

@@ -48,7 +48,9 @@ def process_tokens(self, tokens):
     def leave_module(self, _):
         self._init()
 
-    def visit_ifexp(self, _):
+    def visit_ifexp(self, node):
+        if isinstance(node.parent, astroid.FormattedValue):
+            return
         self._if_counter += 1
 
     def visit_comprehension(self, node):