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

Use an import name list as long as possible

Browse Source
This commit is contained in:
Dave Halter
2018-07-05 18:11:58 +02:00
parent d8c0d8e5d2
commit 37a40d53a8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/imports.py
+4 -6
View File
@@ -302,9 +302,9 @@ class Importer(object):
return self._do_import(('flaskext',) + import_path[2:], sys_path) return self._do_import(('flaskext',) + import_path[2:], sys_path)
if import_parts[0] in settings.auto_import_modules: if import_parts[0] in settings.auto_import_modules:
module = compiled.load_module( module = _load_module(
self._evaluator, self._evaluator,
dotted_name='.'.join(import_parts), import_names=import_parts,
sys_path=sys_path, sys_path=sys_path,
) )
return ContextSet(module) return ContextSet(module)
@@ -473,7 +473,7 @@ class Importer(object):
def _load_module(evaluator, path=None, code=None, sys_path=None, def _load_module(evaluator, path=None, code=None, sys_path=None,
import_names=None, safe_module_name=False, auto_import=False): import_names=None, safe_module_name=False):
if import_names is None: if import_names is None:
dotted_name = None dotted_name = None
else: else:
@@ -498,9 +498,7 @@ def _load_module(evaluator, path=None, code=None, sys_path=None,
if sys_path is None: if sys_path is None:
sys_path = evaluator.get_sys_path() sys_path = evaluator.get_sys_path()
if path is not None and path.endswith(('.py', '.zip', '.egg')) \ if path is not None and path.endswith(('.py', '.zip', '.egg')):
and not auto_import:
module_node = evaluator.parse( module_node = evaluator.parse(
code=code, path=path, cache=True, diff_cache=True, code=code, path=path, cache=True, diff_cache=True,
cache_path=settings.cache_directory) cache_path=settings.cache_directory)