Skip to content
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.

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

fix(import): support for nested namespace packages #1805

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 7 additions & 14 deletions jedi/inference/imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -422,20 +422,13 @@ def import_module(inference_state, import_names, parent_module_value, sys_path):
# The module might not be a package.
return NO_VALUES

for path in paths:
# At the moment we are only using one path. So this is
# not important to be correct.
if not isinstance(path, list):
path = [path]
file_io_or_ns, is_pkg = inference_state.compiled_subprocess.get_module_info(
string=import_names[-1],
path=path,
full_name=module_name,
is_global_search=False,
)
if is_pkg is not None:
break
else:
file_io_or_ns, is_pkg = inference_state.compiled_subprocess.get_module_info(
string=import_names[-1],
path=paths,
full_name=module_name,
is_global_search=False,
)
if is_pkg is None:
return NO_VALUES

if isinstance(file_io_or_ns, ImplicitNSInfo):
Expand Down
1 change: 1 addition & 0 deletions test/completion/namespace1/pkg1/pkg2/mod1.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mod1_name = 'mod1'
1 change: 1 addition & 0 deletions test/completion/namespace2/pkg1/pkg2/mod2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mod2_name = 'mod2'
18 changes: 18 additions & 0 deletions test/completion/ns_path.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import sys
import os
from os.path import dirname

sys.path.insert(0, os.path.join(dirname(__file__), 'namespace2'))
sys.path.insert(0, os.path.join(dirname(__file__), 'namespace1'))

#? ['mod1']
import pkg1.pkg2.mod1

#? ['mod2']
import pkg1.pkg2.mod2

#? ['mod1_name']
pkg1.pkg2.mod1.mod1_name

#? ['mod2_name']
pkg1.pkg2.mod2.mod2_name