p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python: collect: revisit

This commit is contained in:
Daniel Hahler 2018-10-26 16:06:16 +02:00
parent 8d0e1a99e4
commit dcdf86ef5b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/_pytest/python.py
View File

@ -560,19 +560,16 @@ class Package(Module):
yield Module(init_module, self) yield Module(init_module, self)
pkg_prefixes = set() pkg_prefixes = set()
for path in this_path.visit(rec=self._recurse, bf=True, sort=True): for path in this_path.visit(rec=self._recurse, bf=True, sort=True):
# we will visit our own __init__.py file, in which case we skip it # We will visit our own __init__.py file, in which case we skip it.
skip = False if path.isfile():
if path.basename == "__init__.py" and path.dirpath() == this_path: if path.basename == "__init__.py" and path.dirpath() == this_path:
continue continue
for pkg_prefix in pkg_prefixes: parts = path.parts()
if ( if any(
pkg_prefix in path.parts() pkg_prefix in parts and pkg_prefix.join("__init__.py") != path
and pkg_prefix.join("__init__.py") != path for pkg_prefix in pkg_prefixes
): ):
skip = True
if skip:
continue continue
if path.isdir() and path.join("__init__.py").check(file=1): if path.isdir() and path.join("__init__.py").check(file=1):