From b659b20d27924bd48c6461f26e8639f05ad8cb5e Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 8 Mar 2019 18:20:00 +0100 Subject: [PATCH] Fix an issue between different subprocess versions --- jedi/evaluate/context/namespace.py | 2 +- jedi/evaluate/imports.py | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/jedi/evaluate/context/namespace.py b/jedi/evaluate/context/namespace.py index f41898c7..08aef4a4 100644 --- a/jedi/evaluate/context/namespace.py +++ b/jedi/evaluate/context/namespace.py @@ -51,7 +51,7 @@ class ImplicitNamespaceContext(Context): return self._fullname def py__path__(self): - return [self.paths] + return self.paths def py__name__(self): return self._fullname diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py index c7938101..bb332e88 100644 --- a/jedi/evaluate/imports.py +++ b/jedi/evaluate/imports.py @@ -203,7 +203,7 @@ class Importer(object): :param import_path: List of namespaces (strings or Names). """ - debug.speed('import %s' % (import_path,)) + debug.speed('import %s %s' % (import_path, module_context)) self._evaluator = evaluator self.level = level self.module_context = module_context @@ -346,13 +346,9 @@ class Importer(object): paths = method() debug.dbg('search_module %s in paths %s', module_name, paths) 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] code, module_path, is_pkg = self._evaluator.compiled_subprocess.get_module_info( string=import_parts[-1], - path=path, + path=[force_unicode(path)], full_name=module_name, is_global_search=False, )