squash! _recurse: skip __pycache__

Fix __pycache__/.pyc handling.

Time: 3.51s => 3.23

Author: blueyed

src/_pytest/main.py

@@ -528,9 +528,21 @@ def _collect(self, arg):
         if argpath.check(dir=1):
             assert not names, "invalid arg %r" % (arg,)
 
+            if six.PY2:
+
+                def filter_(f):
+                    return f.check(file=1) and f.strpath.endswith("*.pyc")
+
+            else:
+
+                def filter_(f):
+                    if f.check(file=1):
+                        assert not f.strpath.endswith("*.pyc")
+                    return f.check(file=1)
+
             seen_dirs = set()
             for path in argpath.visit(
-                fil=lambda x: x.check(file=1), rec=self._recurse, bf=True, sort=True
+                fil=filter_, rec=self._recurse, bf=True, sort=True
             ):
                 dirpath = path.dirpath()
                 if dirpath not in seen_dirs:
@@ -568,18 +580,17 @@ def _collectfile(self, path):
                 return ()
         return ihook.pytest_collect_file(path=path, parent=self)
 
-    def _recurse(self, path):
-        dirpath = path.dirpath()
+    def _recurse(self, dirpath):
         if dirpath.basename == "__pycache__":
-            return True
-        ihook = self.gethookproxy(dirpath)
-        if ihook.pytest_ignore_collect(path=path, config=self.config):
+            return
+        ihook = self.gethookproxy(dirpath.dirpath())
+        if ihook.pytest_ignore_collect(path=dirpath, config=self.config):
             return
         for pat in self._norecursepatterns:
-            if path.check(fnmatch=pat):
+            if dirpath.check(fnmatch=pat):
                 return False
-        ihook = self.gethookproxy(path)
-        ihook.pytest_collect_directory(path=path, parent=self)
+        ihook = self.gethookproxy(dirpath)
+        ihook.pytest_collect_directory(path=dirpath, parent=self)
         return True
 
     def _tryconvertpyarg(self, x):

src/_pytest/python.py

@@ -517,15 +517,17 @@ def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
         self._norecursepatterns = session._norecursepatterns
         self.fspath = fspath
 
-    def _recurse(self, path):
-        ihook = self.gethookproxy(path.dirpath())
-        if ihook.pytest_ignore_collect(path=path, config=self.config):
-            return False
+    def _recurse(self, dirpath):
+        if dirpath.basename == "__pycache__":
+            return
+        ihook = self.gethookproxy(dirpath.dirpath())
+        if ihook.pytest_ignore_collect(path=dirpath, config=self.config):
+            return
         for pat in self._norecursepatterns:
-            if path.check(fnmatch=pat):
+            if dirpath.check(fnmatch=pat):
                 return False
-        ihook = self.gethookproxy(path)
-        ihook.pytest_collect_directory(path=path, parent=self)
+        ihook = self.gethookproxy(dirpath)
+        ihook.pytest_collect_directory(path=dirpath, parent=self)
         return True
 
     def gethookproxy(self, fspath):