floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: inline _collect() into collect() 

This removes an unhelpful level of indirection and enables some upcoming
upcoming simplifications.
This commit is contained in:
Ran Benita 2020-08-22 11:15:10 +03:00
parent eec13ba57e
commit d0e8b71404
1 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/_pytest/main.py
View File

@ -637,21 +637,12 @@ class Session(nodes.FSCollector):
return items return items
def collect(self) -> Iterator[Union[nodes.Item, nodes.Collector]]: def collect(self) -> Iterator[Union[nodes.Item, nodes.Collector]]:
for fspath, parts in self._initial_parts:
self.trace("processing argument", (fspath, parts))
self.trace.root.indent += 1
yield from self._collect(fspath, parts)
self.trace.root.indent -= 1
self._collection_node_cache1.clear()
self._collection_node_cache2.clear()
self._collection_matchnodes_cache.clear()
self._collection_pkg_roots.clear()
def _collect(
self, argpath: py.path.local, names: Sequence[str]
) -> Iterator[Union[nodes.Item, nodes.Collector]]:
from _pytest.python import Package from _pytest.python import Package
for argpath, names in self._initial_parts:
self.trace("processing argument", (argpath, names))
self.trace.root.indent += 1
# Start with a Session root, and delve to argpath item (dir or file) # Start with a Session root, and delve to argpath item (dir or file)
# and stack all Packages found on the way. # and stack all Packages found on the way.
# No point in finding packages when collecting doctests. # No point in finding packages when collecting doctests.
@ -669,7 +660,9 @@ class Session(nodes.FSCollector):
if col: if col:
if isinstance(col[0], Package): if isinstance(col[0], Package):
self._collection_pkg_roots[str(parent)] = col[0] self._collection_pkg_roots[str(parent)] = col[0]
self._collection_node_cache1[col[0].fspath] = [col[0]] self._collection_node_cache1[col[0].fspath] = [
col[0]
]
# If it's a directory argument, recurse and look for any Subpackages. # If it's a directory argument, recurse and look for any Subpackages.
# Let the Package collector deal with subnodes, don't collect here. # Let the Package collector deal with subnodes, don't collect here.
@ -718,7 +711,7 @@ class Session(nodes.FSCollector):
if not m: if not m:
report_arg = "::".join((str(argpath), *names)) report_arg = "::".join((str(argpath), *names))
self._notfound.append((report_arg, col)) self._notfound.append((report_arg, col))
return continue
# If __init__.py was the only file requested, then the matched node will be # If __init__.py was the only file requested, then the matched node will be
# the corresponding Package, and the first yielded item will be the __init__ # the corresponding Package, and the first yielded item will be the __init__
@ -733,9 +726,15 @@ class Session(nodes.FSCollector):
# file in it, which gets ignored by the default # file in it, which gets ignored by the default
# "python_files" option. # "python_files" option.
pass pass
return continue
yield from m yield from m
self.trace.root.indent -= 1
self._collection_node_cache1.clear()
self._collection_node_cache2.clear()
self._collection_matchnodes_cache.clear()
self._collection_pkg_roots.clear()
def matchnodes( def matchnodes(
self, self,
matching: Sequence[Union[nodes.Item, nodes.Collector]], matching: Sequence[Union[nodes.Item, nodes.Collector]],