From 92d96ac3366f93da5dd48fc958f689f926ef1c54 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 1 Jan 2021 02:59:42 +0100 Subject: [PATCH] actually use auto_import_modules correctly --- jedi/inference/gradual/typeshed.py | 2 +- test/test_settings.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jedi/inference/gradual/typeshed.py b/jedi/inference/gradual/typeshed.py index a4b28786..1fd53113 100644 --- a/jedi/inference/gradual/typeshed.py +++ b/jedi/inference/gradual/typeshed.py @@ -120,7 +120,7 @@ def import_module_decorator(func): ) inference_state.module_cache.add(import_names, python_value_set) - if not prefer_stubs: + if not prefer_stubs or import_names[0] in settings.auto_import_modules: return python_value_set stub = try_to_load_stub_cached(inference_state, import_names, python_value_set, diff --git a/test/test_settings.py b/test/test_settings.py index 77a763a9..8ecc4fb8 100644 --- a/test/test_settings.py +++ b/test/test_settings.py @@ -1,9 +1,8 @@ import pytest from jedi import settings -from jedi.inference.names import ValueName from jedi.inference.compiled import CompiledValueName -from jedi.inference.gradual.typeshed import StubModuleValue +from jedi.inference.compiled.value import CompiledModule @pytest.fixture() @@ -13,9 +12,9 @@ def auto_import_json(monkeypatch): def test_base_auto_import_modules(auto_import_json, Script): loads, = Script('import json; json.loads').infer() - assert isinstance(loads._name, ValueName) + assert isinstance(loads._name, CompiledValueName) value, = loads._name.infer() - assert isinstance(value.parent_context._value, StubModuleValue) + assert isinstance(value.parent_context._value, CompiledModule) def test_auto_import_modules_imports(auto_import_json, Script):