Sync {Session,Package}._recurse

Author: blueyed

src/_pytest/main.py

@@ -625,7 +625,7 @@ def _collectfile(self, path, handle_dupes=True):
 
         return ihook.pytest_collect_file(path=path, parent=self)
 
-    def _recurse(self, dirpath):
+    def _recurse(self, dirpath: py.path.local) -> bool:
         if dirpath.basename == "__pycache__":
             return False
         ihook = self.gethookproxy(dirpath.dirpath())

src/_pytest/python.py

@@ -571,12 +571,12 @@ def setup(self):
             func = partial(_call_with_optional_argument, teardown_module, self.obj)
             self.addfinalizer(func)
 
-    def _recurse(self, dirpath):
+    def _recurse(self, dirpath: py.path.local) -> bool:
         if dirpath.basename == "__pycache__":
             return False
         ihook = self.gethookproxy(dirpath.dirpath())
         if ihook.pytest_ignore_collect(path=dirpath, config=self.config):
-            return
+            return False
         for pat in self._norecursepatterns:
             if dirpath.check(fnmatch=pat):
                 return False