Skip to content

Avoid "No such file or directory" if module ancestor doesn't exist #5785

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

Merged
merged 3 commits into from
Oct 13, 2018
Merged

Avoid "No such file or directory" if module ancestor doesn't exist #5785

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92e7a7d
Only return ns_ancestors in namespace-package mode
Oct 12, 2018
8bee0a3
Might as well use belt and suspenders
Oct 12, 2018
6122776
Better fix -- roll back the previous attempts in favor of isdir() check
Oct 13, 2018
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
Prev Previous commit
Better fix -- roll back the previous attempts in favor of isdir() check
  • Loading branch information
Guido van Rossum committed Oct 13, 2018
commit 6122776d9e3f2e8ecc1b6b2077ed3bcb10d5a9d6
10 changes: 3 additions & 7 deletions mypy/modulefinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def _update_ns_ancestors(self, components: List[str], match: Tuple[str, bool]) -
path, verify = match
for i in range(1, len(components)):
pkg_id = '.'.join(components[:-i])
if pkg_id not in self.ns_ancestors:
if pkg_id not in self.ns_ancestors and self.fscache.isdir(path):
self.ns_ancestors[pkg_id] = path
path = os.path.dirname(path)

Expand Down Expand Up @@ -165,8 +165,7 @@ def _find_module(self, id: str) -> Optional[str]:
non_stub_match = self._find_module_non_stub_helper(components, pkg_dir)
if non_stub_match:
third_party_inline_dirs.append(non_stub_match)
if self.options and self.options.namespace_packages:
self._update_ns_ancestors(components, non_stub_match)
self._update_ns_ancestors(components, non_stub_match)
if self.options and self.options.use_builtins_fixtures:
# Everything should be in fixtures.
third_party_inline_dirs.clear()
Expand Down Expand Up @@ -240,10 +239,7 @@ def _find_module(self, id: str) -> Optional[str]:
# installed package with a py.typed marker that is a
# subpackage of a namespace package. We only fess up to these
# if we would otherwise return "not found".
if self.options and self.options.namespace_packages:
return self.ns_ancestors.get(id)

return None
return self.ns_ancestors.get(id)

def find_modules_recursive(self, module: str) -> List[BuildSource]:
module_path = self.find_module(module)
Expand Down