From 709bcbf3c413850b7bf10634b2637292ddda331d Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Fri, 1 May 2020 14:40:16 +0300
Subject: [PATCH] Type annotate _pytest.mark.evaluate

---
 src/_pytest/mark/evaluate.py | 37 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/_pytest/mark/evaluate.py b/src/_pytest/mark/evaluate.py
index c47174e71..759191668 100644
--- a/src/_pytest/mark/evaluate.py
+++ b/src/_pytest/mark/evaluate.py
@@ -4,10 +4,14 @@ import sys
 import traceback
 from typing import Any
 from typing import Dict
+from typing import List
+from typing import Optional
 
 from ..outcomes import fail
 from ..outcomes import TEST_OUTCOME
+from .structures import Mark
 from _pytest.config import Config
+from _pytest.nodes import Item
 from _pytest.store import StoreKey
 
 
@@ -28,29 +32,29 @@ def cached_eval(config: Config, expr: str, d: Dict[str, object]) -> Any:
 
 
 class MarkEvaluator:
-    def __init__(self, item, name):
+    def __init__(self, item: Item, name: str) -> None:
         self.item = item
-        self._marks = None
-        self._mark = None
+        self._marks = None  # type: Optional[List[Mark]]
+        self._mark = None  # type: Optional[Mark]
         self._mark_name = name
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         # don't cache here to prevent staleness
         return bool(self._get_marks())
 
-    def wasvalid(self):
+    def wasvalid(self) -> bool:
         return not hasattr(self, "exc")
 
-    def _get_marks(self):
+    def _get_marks(self) -> List[Mark]:
         return list(self.item.iter_markers(name=self._mark_name))
 
-    def invalidraise(self, exc):
+    def invalidraise(self, exc) -> Optional[bool]:
         raises = self.get("raises")
         if not raises:
-            return
+            return None
         return not isinstance(exc, raises)
 
-    def istrue(self):
+    def istrue(self) -> bool:
         try:
             return self._istrue()
         except TEST_OUTCOME:
@@ -69,25 +73,26 @@ class MarkEvaluator:
                 pytrace=False,
             )
 
-    def _getglobals(self):
+    def _getglobals(self) -> Dict[str, object]:
         d = {"os": os, "sys": sys, "platform": platform, "config": self.item.config}
         if hasattr(self.item, "obj"):
-            d.update(self.item.obj.__globals__)
+            d.update(self.item.obj.__globals__)  # type: ignore[attr-defined] # noqa: F821
         return d
 
-    def _istrue(self):
+    def _istrue(self) -> bool:
         if hasattr(self, "result"):
-            return self.result
+            result = getattr(self, "result")  # type: bool
+            return result
         self._marks = self._get_marks()
 
         if self._marks:
             self.result = False
             for mark in self._marks:
                 self._mark = mark
-                if "condition" in mark.kwargs:
-                    args = (mark.kwargs["condition"],)
-                else:
+                if "condition" not in mark.kwargs:
                     args = mark.args
+                else:
+                    args = (mark.kwargs["condition"],)
 
                 for expr in args:
                     self.expr = expr