Remove context manager from analyze_cond_branch call

Author: dixith

mypy/checkexpr.py

@@ -2807,9 +2807,9 @@ def check_boolean_op(self, e: OpExpr, context: Context) -> Type:
 
         if right_map is None:
             with self.msg.disable_errors():
-                right_type = self.analyze_cond_branch(right_map, e.right, left_type)
+                right_type = self.analyze_cond_branch(None, e.right, left_type)
         else:
-            right_type = self.analyze_cond_branch(right_map, e.right, left_type)
+            right_type = self.analyze_cond_branch(right_map, e.right, left_type)        
 
         if right_map is None:
             # The boolean expression is statically known to be the left value

mypy/messages.py

@@ -137,6 +137,9 @@ def add_errors(self, messages: 'MessageBuilder') -> None:
                 for info in errs:
                     self.errors.add_error_info(info)
 
+    def disable_errors1(self) -> None:
+        self.disable_count += 1
+
     @contextmanager
     def disable_errors(self) -> Iterator[None]:
         self.disable_count += 1
@@ -145,6 +148,9 @@ def disable_errors(self) -> Iterator[None]:
         finally:
             self.disable_count -= 1
 
+    def enable_errors(self) -> None:
+        self.disable_count -= 1
+
     def is_errors(self) -> bool:
         return self.errors.is_errors()