fix _should_rewrite: pass py.path.local

Author: blueyed

src/_pytest/assertion/rewrite.py

@@ -18,6 +18,9 @@
 from typing import Optional
 from typing import Set
 from typing import Tuple
+from typing import TYPE_CHECKING
+
+import py.path
 
 from _pytest._io.saferepr import safeformat
 from _pytest._io.saferepr import saferepr
@@ -31,6 +34,10 @@
 from _pytest.pathlib import Path
 from _pytest.pathlib import PurePath
 
+if TYPE_CHECKING:
+    from _pytest.assertion import AssertionState
+    from _pytest.main import Session
+
 # pytest caches rewritten pycs in pycache dirs
 PYTEST_TAG = "{}-pytest-{}".format(sys.implementation.cache_tag, version)
 PYC_EXT = ".py" + (__debug__ and "c" or "o")
@@ -46,7 +53,7 @@ def __init__(self, config):
             self.fnpats = config.getini("python_files")
         except ValueError:
             self.fnpats = ["test_*.py", "*_test.py"]
-        self.session = None
+        self.session = None  # type: Optional[Session]
         self._rewritten_names = set()  # type: Set[str]
         self._must_rewrite = set()  # type: Set[str]
         # flag to guard against trying to rewrite a pyc file while we are already writing another pyc file,
@@ -56,7 +63,7 @@ def __init__(self, config):
         self._marked_for_rewrite_cache = {}  # type: Dict[str, bool]
         self._session_paths_checked = False
 
-    def set_session(self, session):
+    def set_session(self, session: "Optional[Session]") -> None:
         self.session = session
         self._session_paths_checked = False
 
@@ -182,14 +189,14 @@ def _early_rewrite_bailout(self, name, state):
         state.trace("early skip of rewriting module: {}".format(name))
         return True
 
-    def _should_rewrite(self, name, fn, state):
+    def _should_rewrite(self, name: str, fn: str, state: "AssertionState") -> bool:
         # always rewrite conftest files
         if os.path.basename(fn) == "conftest.py":
             state.trace("rewriting conftest file: {!r}".format(fn))
             return True
 
         if self.session is not None:
-            if self.session.isinitpath(fn):
+            if self.session.isinitpath(py.path.local(fn)):
                 state.trace(
                     "matched test file (was specified on cmdline): {!r}".format(fn)
                 )
@@ -205,7 +212,7 @@ def _should_rewrite(self, name, fn, state):
 
         return self._is_marked_for_rewrite(name, state)
 
-    def _is_marked_for_rewrite(self, name: str, state):
+    def _is_marked_for_rewrite(self, name: str, state: "AssertionState") -> bool:
         try:
             return self._marked_for_rewrite_cache[name]
         except KeyError:

src/_pytest/main.py

@@ -458,7 +458,7 @@ def pytest_runtest_logreport(self, report):
 
     pytest_collectreport = pytest_runtest_logreport
 
-    def isinitpath(self, path):
+    def isinitpath(self, path: "py.path.local") -> bool:
         return path in self._initialpaths
 
     def gethookproxy(self, fspath: py.path.local):

testing/test_assertrewrite.py

@@ -21,10 +21,15 @@
 from _pytest.assertion.rewrite import PYC_TAIL
 from _pytest.assertion.rewrite import PYTEST_TAG
 from _pytest.assertion.rewrite import rewrite_asserts
+from _pytest.compat import TYPE_CHECKING
 from _pytest.config import ExitCode
 from _pytest.pathlib import Path
 from _pytest.pytester import Testdir
 
+if TYPE_CHECKING:
+    from typing import List
+    from typing import Set
+
 
 def setup_module(mod):
     mod._old_reprcompare = util._reprcompare
@@ -1250,14 +1255,14 @@ def spy_write_pyc(*args, **kwargs):
 
 class TestEarlyRewriteBailout:
     @pytest.fixture
-    def hook(self, pytestconfig, monkeypatch, testdir):
+    def hook(self, pytestconfig, monkeypatch, testdir) -> AssertionRewritingHook:
         """Returns a patched AssertionRewritingHook instance so we can configure its initial paths and track
         if PathFinder.find_spec has been called.
         """
         import importlib.machinery
 
-        self.find_spec_calls = []
-        self.initial_paths = set()
+        self.find_spec_calls = []  # type: List[str]
+        self.initial_paths = set()  # type: Set[py.path.local]
 
         class StubSession:
             _initialpaths = self.initial_paths
@@ -1281,7 +1286,7 @@ def spy_find_spec(name, path):
         testdir.syspathinsert()
         return hook
 
-    def test_basic(self, testdir, hook):
+    def test_basic(self, testdir: "Testdir", hook: AssertionRewritingHook) -> None:
         """
         Ensure we avoid calling PathFinder.find_spec when we know for sure a certain
         module will not be rewritten to optimize assertion rewriting (#3918).