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

Refactor some of the import logic so it's possible to load typeshed modules

Browse Source
This commit is contained in:
Dave Halter
2018-07-24 01:19:09 +02:00
parent f72f3f3797
commit 1739ae44f0
3 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jedi/plugins/flask.py
View File

@@ -10,20 +10,21 @@ class FlaskPlugin(BasePlugin):
Handle "magic" Flask extension imports:
``flask.ext.foo`` is really ``flask_foo`` or ``flaskext.foo``.
"""
def wrapper(evaluator, import_names, *args, **kwargs):
if len(import_names) > 2 and import_names[:2] == ('flask', 'ext'):
def wrapper(evaluator, import_names, module_context, sys_path):
if len(import_names) == 3 and import_names[:2] == ('flask', 'ext'):
# New style.
ipath = ('flask_' + str(import_names[2]),) + import_names[3:]
ipath = ('flask_' + import_names[2]),
try:
return callback(evaluator, ipath, *args, **kwargs)
return callback(evaluator, ipath, None, sys_path)
except JediImportError:
# Old style
context_set = callback(evaluator, ('flaskext',), None, sys_path)
# If context_set has no content a JediImportError is raised
# which should be caught anyway by the caller.
return callback(
evaluator,
('flaskext',) + import_names[2:],
*args,
**kwargs
('flaskext', import_names[2]),
next(iter(context_set)),
sys_path
)
return callback(evaluator, import_names, *args, **kwargs)
return callback(evaluator, import_names, module_context, sys_path)
return wrapper

6
jedi/plugins/stdlib.py
View File

@@ -78,14 +78,14 @@ class StdlibPlugin(BasePlugin):
return wrapper
def import_module(self, callback):
def wrapper(evaluator, import_names, sys_path):
def wrapper(evaluator, import_names, module_context, sys_path):
# This is a huge exception, we follow a nested import
# ``os.path``, because it's a very important one in Python
# that is being achieved by messing with ``sys.modules`` in
# ``os``.
if import_names == ('os', 'path'):
return callback(evaluator, ('os',), sys_path).py__getattribute__('path')
return callback(evaluator, import_names, sys_path)
return module_context.py__getattribute__('path')
return callback(evaluator, import_names, module_context, sys_path)
return wrapper