replace the critical in comparisons for testing

tyralla · tyralla · commit 207c56eb3cd7 · 2024-03-19T23:05:48.000+01:00
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -3575,7 +3575,7 @@ def visit_comparison_expr(self, e: ComparisonExpr) -> Type:
 
                 # Only show dangerous overlap if there are no other errors. See
                 # testCustomEqCheckStrictEquality for an example.
-                if not w.has_new_errors() and operator in ("==", "!="):
+                if not w.has_new_errors() and (operator == "==" or operator == "!="):
                     right_type = self.accept(right)
                     if self.dangerous_comparison(left_type, right_type):
                         # Show the most specific literal types possible
diff --git a/mypy/find_sources.py b/mypy/find_sources.py
@@ -106,7 +106,7 @@ def find_sources_in_dir(self, path: str) -> list[BuildSource]:
         names = sorted(self.fscache.listdir(path), key=keyfunc)
         for name in names:
             # Skip certain names altogether
-            if name in ("__pycache__", "site-packages", "node_modules") or name.startswith("."):
+            if (name == "__pycache__" or name == "site-packages" or name == "node_modules") or name.startswith("."):
                 continue
             subpath = os.path.join(path, name)
 
diff --git a/mypy/reachability.py b/mypy/reachability.py
@@ -130,8 +130,8 @@ def infer_condition_value(expr: Expression, options: Options) -> int:
         name = expr.name
     elif isinstance(expr, OpExpr) and expr.op in ("and", "or"):
         left = infer_condition_value(expr.left, options)
-        if (left in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "and") or (
-            left in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "or"
+        if ((left == ALWAYS_TRUE or left == MYPY_TRUE) and expr.op == "and") or (
+            (left == ALWAYS_FALSE or left == MYPY_FALSE) and expr.op == "or"
         ):
             # Either `True and <other>` or `False or <other>`: the result will
             # always be the right-hand-side.
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -5301,13 +5301,13 @@ def visit_op_expr(self, expr: OpExpr) -> None:
 
         if expr.op in ("and", "or"):
             inferred = infer_condition_value(expr.left, self.options)
-            if (inferred in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "and") or (
-                inferred in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "or"
+            if ((inferred == ALWAYS_FALSE or inferred == MYPY_FALSE) and expr.op == "and") or (
+                (inferred == ALWAYS_TRUE or inferred == MYPY_TRUE) and expr.op == "or"
             ):
                 expr.right_unreachable = True
                 return
-            elif (inferred in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "and") or (
-                inferred in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "or"
+            elif ((inferred == ALWAYS_TRUE or inferred == MYPY_TRUE) and expr.op == "and") or (
+                (inferred == ALWAYS_FALSE or inferred == MYPY_FALSE) and expr.op == "or"
             ):
                 expr.right_always = True
 
