VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Restructure relative importing a bit and improve tests

Browse Source
This commit is contained in:
Dave Halter
2019-03-04 09:24:38 +01:00
parent 467c2e5def
commit 23d61e5e97
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
jedi/evaluate/imports.py
View File

@@ -221,9 +221,23 @@ class Importer(object):
base = module_context.py__package__().split('.')
if base == [''] or base == ['__main__']:
base = []
if level > len(base):
# We need to care for two cases, the second is if it's a valid
# Python
if level <= len(base):
# Here we basically rewrite the level to 0.
base = tuple(base)
if level > 1:
base = base[:-level + 1]
import_path = base + tuple(import_path)
else:
path = module_context.py__file__()
if path is not None:
if path is None:
# If no path is defined in the module we have no ideas where we
# are in the file system. Therefore we cannot know what to do.
# In this case we just let the path there and ignore that it's
# a relative path. Not sure if that's a good idea.
pass
else:
import_path = list(import_path)
p = path
for i in range(level):
@@ -240,17 +254,6 @@ class Importer(object):
message='Attempted relative import beyond top-level package.'
)
import_path = []
# If no path is defined in the module we have no ideas where we
# are in the file system. Therefore we cannot know what to do.
# In this case we just let the path there and ignore that it's
# a relative path. Not sure if that's a good idea.
else:
# Here we basically rewrite the level to 0.
base = tuple(base)
if level > 1:
base = base[:-level + 1]
import_path = base + tuple(import_path)
self.import_path = import_path
@property

22
test/test_evaluate/test_imports.py
View File

@@ -277,14 +277,22 @@ def test_get_modules_containing_name(evaluator, path, goal):
@pytest.mark.parametrize(
'path', ('api/whatever/test_this.py', 'api/whatever/file'))
def test_relative_imports_with_multiple_similar_directories(Script, path):
@pytest.mark.parametrize('empty_sys_path', (False, True))
def test_relative_imports_with_multiple_similar_directories(Script, path, empty_sys_path):
dir = get_example_dir('issue1209')
script = Script(
"from .",
path=os.path.join(dir, path)
)
# TODO pass this project to the script as a param once that's possible.
script._evaluator.project = Project(dir)
if empty_sys_path:
script = Script(
"from .",
path=os.path.join(dir, path),
)
script._evaluator.project = Project(dir, smart_sys_path=False)
else:
script = Script(
"from .",
path=os.path.join(dir, path),
)
# TODO pass this project to the script as a param once that's possible.
script._evaluator.project = Project(dir)
name, import_ = script.completions()
assert import_.name == 'import'
assert name.name == 'api_test1'