From 7fc7e631f8a6b0f18cfc8c39a59ffc4aaa147d34 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 15 May 2019 21:06:36 +0200 Subject: [PATCH] Move a part of stub lookups --- jedi/evaluate/gradual/typeshed.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jedi/evaluate/gradual/typeshed.py b/jedi/evaluate/gradual/typeshed.py index 96c7c44f..42b11b29 100644 --- a/jedi/evaluate/gradual/typeshed.py +++ b/jedi/evaluate/gradual/typeshed.py @@ -163,7 +163,12 @@ def _try_to_load_stub(evaluator, actual_context_set, parent_module_context, sys_ if m is not None: return m - # 3. Try to load pyi file somewhere if actual_context_set was not defined. + # 3. finally try to load typeshed + m = _load_from_typeshed(evaluator, actual_context_set, parent_module_context, import_names) + if m is not None: + return m + + # 4. Try to load pyi file somewhere if actual_context_set was not defined. if not actual_context_set: if parent_module_context is not None: # TODO this attribute doesn't always exist @@ -185,11 +190,6 @@ def _try_to_load_stub(evaluator, actual_context_set, parent_module_context, sys_ if m is not None: return m - # 4. finally try to load typeshed - m = _load_from_typeshed(evaluator, actual_context_set, parent_module_context, import_names) - if m is not None: - return m - evaluator.stub_module_cache[import_names] = None # If no stub is found, that's fine, the calling function has to deal with # it.