diff --git a/docs/source/error_code_list2.rst b/docs/source/error_code_list2.rst index c91c1ba20a2c..6f12e8a8d5eb 100644 --- a/docs/source/error_code_list2.rst +++ b/docs/source/error_code_list2.rst @@ -193,3 +193,24 @@ incorrect control flow or conditional checks that are accidentally always true o return # Error: Statement is unreachable [unreachable] print('unreachable') + +Check that expression is redundant [redundant-expr] +--------------------------------------------------- + +If you use :option:`--enable-error-code redundant-expr `, +mypy generates an error if it thinks that an expression is redundant. + +.. code-block:: python + + # mypy: enable-error-code redundant-expr + + def example(x: int) -> None: + # Error: Left operand of 'and' is always true [redundant-expr] + if isinstance(x, int) and x > 0: + pass + + # Error: If condition is always true [redundant-expr] + 1 if isinstance(x, int) else 0 + + # Error: If condition in comprehension is always true [redundant-expr] + [i for i in range(x) if isinstance(i, int)] diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py index aa371548127e..74687d2edf24 100644 --- a/mypy/checkexpr.py +++ b/mypy/checkexpr.py @@ -2740,6 +2740,17 @@ def check_boolean_op(self, e: OpExpr, context: Context) -> Type: restricted_left_type = true_only(left_type) result_is_left = not left_type.can_be_false + # If left_map is None then we know mypy considers the left expression + # to be redundant. + # + # Note that we perform these checks *before* we take into account + # the analysis from the semanal phase below. We assume that nodes + # marked as unreachable during semantic analysis were done so intentionally. + # So, we shouldn't report an error. + if codes.REDUNDANT_EXPR in self.chk.options.enabled_error_codes: + if left_map is None: + self.msg.redundant_left_operand(e.op, e.left) + # If right_map is None then we know mypy considers the right branch # to be unreachable and therefore any errors found in the right branch # should be suppressed. @@ -2749,10 +2760,8 @@ def check_boolean_op(self, e: OpExpr, context: Context) -> Type: # marked as unreachable during semantic analysis were done so intentionally. # So, we shouldn't report an error. if self.chk.options.warn_unreachable: - if left_map is None: - self.msg.redundant_left_operand(e.op, e.left) if right_map is None: - self.msg.redundant_right_operand(e.op, e.right) + self.msg.unreachable_right_operand(e.op, e.right) if e.right_unreachable: right_map = None @@ -3673,7 +3682,7 @@ def check_for_comp(self, e: Union[GeneratorExpr, DictionaryComprehension]) -> No for var, type in true_map.items(): self.chk.binder.put(var, type) - if self.chk.options.warn_unreachable: + if codes.REDUNDANT_EXPR in self.chk.options.enabled_error_codes: if true_map is None: self.msg.redundant_condition_in_comprehension(False, condition) elif false_map is None: @@ -3686,7 +3695,7 @@ def visit_conditional_expr(self, e: ConditionalExpr, allow_none_return: bool = F # Gain type information from isinstance if it is there # but only for the current expression if_map, else_map = self.chk.find_isinstance_check(e.cond) - if self.chk.options.warn_unreachable: + if codes.REDUNDANT_EXPR in self.chk.options.enabled_error_codes: if if_map is None: self.msg.redundant_condition_in_if(False, e.cond) elif else_map is None: diff --git a/mypy/errorcodes.py b/mypy/errorcodes.py index 0df1989d17dd..bbcc6e854260 100644 --- a/mypy/errorcodes.py +++ b/mypy/errorcodes.py @@ -112,6 +112,11 @@ def __str__(self) -> str: 'General') # type: Final UNREACHABLE = ErrorCode( 'unreachable', "Warn about unreachable statements or expressions", 'General') # type: Final +REDUNDANT_EXPR = ErrorCode( + 'redundant-expr', + "Warn about redundant expressions", + 'General', + default_enabled=False) # type: Final # Syntax errors are often blocking. SYNTAX = ErrorCode( diff --git a/mypy/main.py b/mypy/main.py index 7038ce40a5c1..6917d08c691d 100644 --- a/mypy/main.py +++ b/mypy/main.py @@ -576,7 +576,7 @@ def add_invertible_flag(flag: str, group=lint_group) add_invertible_flag('--warn-unreachable', default=False, strict_flag=False, help="Warn about statements or expressions inferred to be" - " unreachable or redundant", + " unreachable", group=lint_group) # Note: this group is intentionally added here even though we don't add diff --git a/mypy/messages.py b/mypy/messages.py index 8b689861548f..6067c162ad05 100644 --- a/mypy/messages.py +++ b/mypy/messages.py @@ -1280,7 +1280,7 @@ def redundant_left_operand(self, op_name: str, context: Context) -> None: """ self.redundant_expr("Left operand of '{}'".format(op_name), op_name == 'and', context) - def redundant_right_operand(self, op_name: str, context: Context) -> None: + def unreachable_right_operand(self, op_name: str, context: Context) -> None: """Indicates that the right operand of a boolean expression is redundant: it does not change the truth value of the entire condition as a whole. 'op_name' should either be the string "and" or the string "or". @@ -1299,7 +1299,7 @@ def redundant_condition_in_assert(self, truthiness: bool, context: Context) -> N def redundant_expr(self, description: str, truthiness: bool, context: Context) -> None: self.fail("{} is always {}".format(description, str(truthiness).lower()), - context, code=codes.UNREACHABLE) + context, code=codes.REDUNDANT_EXPR) def impossible_intersection(self, formatted_base_class_list: str, diff --git a/test-data/unit/check-errorcodes.test b/test-data/unit/check-errorcodes.test index c325f568081d..8e075fa8d1e9 100644 --- a/test-data/unit/check-errorcodes.test +++ b/test-data/unit/check-errorcodes.test @@ -771,3 +771,18 @@ def f(**x: int) -> None: f(**1) # type: ignore[arg-type] [builtins fixtures/dict.pyi] [typing fixtures/typing-typeddict.pyi] + +[case testRedundantExpressions] +# flags: --enable-error-code redundant-expr +def foo() -> bool: ... + +lst = [1, 2, 3, 4] + +b = False or foo() # E: Left operand of 'or' is always false [redundant-expr] +c = True and foo() # E: Left operand of 'and' is always true [redundant-expr] +g = 3 if True else 4 # E: If condition is always true [redundant-expr] +h = 3 if False else 4 # E: If condition is always false [redundant-expr] +i = [x for x in lst if True] # E: If condition in comprehension is always true [redundant-expr] +j = [x for x in lst if False] # E: If condition in comprehension is always false [redundant-expr] +k = [x for x in lst if isinstance(x, int) or foo()] # E: If condition in comprehension is always true [redundant-expr] +[builtins fixtures/isinstancelist.pyi] diff --git a/test-data/unit/check-unreachable-code.test b/test-data/unit/check-unreachable-code.test index 262ac86e49ad..f5b49d87289a 100644 --- a/test-data/unit/check-unreachable-code.test +++ b/test-data/unit/check-unreachable-code.test @@ -898,18 +898,11 @@ def foo() -> bool: ... lst = [1, 2, 3, 4] a = True or foo() # E: Right operand of 'or' is never evaluated -b = False or foo() # E: Left operand of 'or' is always false -c = True and foo() # E: Left operand of 'and' is always true d = False and foo() # E: Right operand of 'and' is never evaluated e = True or (True or (True or foo())) # E: Right operand of 'or' is never evaluated f = (True or foo()) or (True or foo()) # E: Right operand of 'or' is never evaluated -g = 3 if True else 4 # E: If condition is always true -h = 3 if False else 4 # E: If condition is always false -i = [x for x in lst if True] # E: If condition in comprehension is always true -j = [x for x in lst if False] # E: If condition in comprehension is always false -k = [x for x in lst if isinstance(x, int) or foo()] # E: If condition in comprehension is always true \ - # E: Right operand of 'or' is never evaluated +k = [x for x in lst if isinstance(x, int) or foo()] # E: Right operand of 'or' is never evaluated [builtins fixtures/isinstancelist.pyi] [case testUnreachableFlagMiscTestCaseMissingMethod] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy