VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-03-02 00:56:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More rename

Browse Source
This commit is contained in:
Dave Halter
2019-08-21 09:53:48 +02:00
parent 9d34df2fed
commit 6142d18206
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jedi/inference/imports.py
View File

@@ -78,45 +78,45 @@ def infer_import(context, tree_name, is_goto=False):
importer = Importer(inference_state, tuple(import_path), importer = Importer(inference_state, tuple(import_path),
module_context, import_node.level) module_context, import_node.level)
types = importer.follow() values = importer.follow()
#if import_node.is_nested() and not self.nested_resolve: #if import_node.is_nested() and not self.nested_resolve:
# scopes = [NestedImportModule(module, import_node)] # scopes = [NestedImportModule(module, import_node)]
if not types: if not values:
return NO_VALUES return NO_VALUES
if from_import_name is not None: if from_import_name is not None:
if is_goto: if is_goto:
types = unite([ values = unite([
c.goto( c.goto(
from_import_name, from_import_name,
name_context=context, name_context=context,
analysis_errors=False analysis_errors=False
) for c in types ) for c in values
]) ])
else: else:
types = types.py__getattribute__( values = values.py__getattribute__(
from_import_name, from_import_name,
name_context=context, name_context=context,
analysis_errors=False analysis_errors=False
) )
if not types: if not values:
path = import_path + [from_import_name] path = import_path + [from_import_name]
importer = Importer(inference_state, tuple(path), importer = Importer(inference_state, tuple(path),
module_context, import_node.level) module_context, import_node.level)
types = importer.follow() values = importer.follow()
# goto only accepts `Name` # goto only accepts `Name`
if is_goto: if is_goto:
types = set(s.name for s in types) values = set(s.name for s in values)
else: else:
# goto only accepts `Name` # goto only accepts `Name`
if is_goto: if is_goto:
types = set(s.name for s in types) values = set(s.name for s in values)
debug.dbg('after import: %s', types) debug.dbg('after import: %s', values)
return types return values
class NestedImportModule(tree.Module): class NestedImportModule(tree.Module):