Skip to content

Fix discovery beside same-named namespace directories #22168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nightcityblade wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −4
Open

Fix discovery beside same-named namespace directories #22168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions mypy/find_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def is_explicit_package_base(self, path: str) -> bool:
def find_sources_in_dir(self, path: str) -> list[BuildSource]:
sources = []

seen: set[str] = set()
seen_file_stems: set[str] = set()
names = sorted(self.fscache.listdir(path), key=keyfunc)
for name in names:
# Skip certain names altogether
Expand All @@ -128,12 +128,16 @@ def find_sources_in_dir(self, path: str) -> list[BuildSource]:
if self.fscache.isdir(subpath):
sub_sources = self.find_sources_in_dir(subpath)
if sub_sources:
seen.add(name)
if any(
self.fscache.isfile(os.path.join(subpath, "__init__" + suffix))
for suffix in PY_EXTENSIONS
):
seen_file_stems.add(name)
sources.extend(sub_sources)
else:
stem, suffix = os.path.splitext(name)
if stem not in seen and suffix in PY_EXTENSIONS:
seen.add(stem)
if stem not in seen_file_stems and suffix in PY_EXTENSIONS:
seen_file_stems.add(stem)
module, base_dir = self.crawl_up(subpath)
sources.append(BuildSource(subpath, module, None, base_dir))

Expand Down
12 changes: 12 additions & 0 deletions mypy/test/test_find_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,18 @@ def test_find_sources_in_dir_namespace(self) -> None:
("f", "/pkg/a1/b"),
]

def test_find_sources_in_same_named_file_and_namespace_dir(self) -> None:
options = Options()
finder = SourceFinder(FakeFSCache({"/pkg/x.py", "/pkg/x/y.py"}), options)

assert find_sources_in_dir(finder, "/pkg") == [("x", "/pkg"), ("y", "/pkg/x")]

def test_find_sources_in_same_named_file_and_package_dir(self) -> None:
options = Options()
finder = SourceFinder(FakeFSCache({"/pkg/x.py", "/pkg/x/__init__.py"}), options)

assert find_sources_in_dir(finder, "/pkg") == [("x", "/pkg")]

def test_find_sources_in_dir_namespace_explicit_base(self) -> None:
options = Options()
options.namespace_packages = True
Expand Down
Loading