From 35c2d660cb63a2dcbc4026c1d1d386a409695294 Mon Sep 17 00:00:00 2001
From: Peter Law <PeterJCLaw@gmail.com>
Date: Tue, 21 Jul 2020 23:30:26 +0100
Subject: [PATCH] Fix most import related mypy errors

---
 jedi/api/classes.py                 |  9 ++++-----
 jedi/debug.py                       |  4 ++--
 jedi/inference/compiled/__init__.py | 16 ++++++++++++++++
 jedi/inference/docstrings.py        |  2 +-
 jedi/inference/references.py        |  3 ++-
 jedi/inference/value/__init__.py    | 15 +++++++++++++++
 jedi/inference/value/instance.py    |  2 +-
 jedi/plugins/pytest.py              |  2 +-
 8 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index 679d1e59..a770ee52 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -17,16 +17,15 @@ import re
 import warnings
 from typing import Optional
 
-from parso.python.tree import search_ancestor
+from parso.tree import search_ancestor
 
 from jedi import settings
 from jedi import debug
 from jedi.inference.utils import unite
 from jedi.cache import memoize_method
-from jedi.inference import imports
-from jedi.inference.imports import ImportName
 from jedi.inference.compiled.mixed import MixedName
-from jedi.inference.gradual.typeshed import StubModuleValue
+from jedi.inference.names import ImportName, SubModuleName
+from jedi.inference.gradual.stub_value import StubModuleValue
 from jedi.inference.gradual.conversion import convert_names, convert_values
 from jedi.inference.base_value import ValueSet
 from jedi.api.keywords import KeywordName
@@ -186,7 +185,7 @@ class BaseName(object):
                     tree_name.is_definition():
                 resolve = True
 
-        if isinstance(self._name, imports.SubModuleName) or resolve:
+        if isinstance(self._name, SubModuleName) or resolve:
             for value in self._name.infer():
                 return value.api_type
         return self._name.api_type
diff --git a/jedi/debug.py b/jedi/debug.py
index 4066cff7..8c7c883f 100644
--- a/jedi/debug.py
+++ b/jedi/debug.py
@@ -20,7 +20,7 @@ try:
         raise ImportError
     else:
         # Use colorama for nicer console output.
-        from colorama import Fore, init
+        from colorama import Fore, init  # type: ignore[import]
         from colorama import initialise
 
         def _lazy_colorama_init():  # noqa: F811
@@ -45,7 +45,7 @@ try:
             _inited = True
 
 except ImportError:
-    class Fore(object):
+    class Fore(object):  # type: ignore[no-redef]
         RED = ''
         GREEN = ''
         YELLOW = ''
diff --git a/jedi/inference/compiled/__init__.py b/jedi/inference/compiled/__init__.py
index faf5d373..f4a8691e 100644
--- a/jedi/inference/compiled/__init__.py
+++ b/jedi/inference/compiled/__init__.py
@@ -2,6 +2,22 @@ from jedi.inference.compiled.value import CompiledValue, CompiledName, \
     CompiledValueFilter, CompiledValueName, create_from_access_path
 from jedi.inference.base_value import LazyValueWrapper
 
+__all__ = (
+    'CompiledValue',
+    'CompiledName',
+    'CompiledValueFilter',
+    'CompiledValueName',
+    'create_from_access_path',
+
+    'LazyValueWrapper',
+
+    'builtin_from_name',
+    'ExactValue',
+    'create_simple_object',
+    'get_string_value_set',
+    'load_module',
+)
+
 
 def builtin_from_name(inference_state, string):
     typing_builtins_module = inference_state.builtins_module
diff --git a/jedi/inference/docstrings.py b/jedi/inference/docstrings.py
index e9c94cdc..ee7a8d89 100644
--- a/jedi/inference/docstrings.py
+++ b/jedi/inference/docstrings.py
@@ -50,7 +50,7 @@ def _get_numpy_doc_string_cls():
     global _numpy_doc_string_cache
     if isinstance(_numpy_doc_string_cache, (ImportError, SyntaxError)):
         raise _numpy_doc_string_cache
-    from numpydoc.docscrape import NumpyDocString
+    from numpydoc.docscrape import NumpyDocString  # type: ignore[import]
     _numpy_doc_string_cache = NumpyDocString
     return _numpy_doc_string_cache
 
diff --git a/jedi/inference/references.py b/jedi/inference/references.py
index e1b97c41..71d7918a 100644
--- a/jedi/inference/references.py
+++ b/jedi/inference/references.py
@@ -5,7 +5,8 @@ from parso import python_bytes_to_unicode
 
 from jedi.debug import dbg
 from jedi.file_io import KnownContentFileIO
-from jedi.inference.imports import SubModuleName, load_module_from_path
+from jedi.inference.names import SubModuleName
+from jedi.inference.imports import load_module_from_path
 from jedi.inference.filters import ParserTreeFilter
 from jedi.inference.gradual.conversion import convert_names
 
diff --git a/jedi/inference/value/__init__.py b/jedi/inference/value/__init__.py
index 2e17ba26..d35f0647 100644
--- a/jedi/inference/value/__init__.py
+++ b/jedi/inference/value/__init__.py
@@ -4,3 +4,18 @@ from jedi.inference.value.function import FunctionValue, \
     MethodValue
 from jedi.inference.value.instance import AnonymousInstance, BoundMethod, \
     CompiledInstance, AbstractInstanceValue, TreeInstance
+
+__all__ = (
+    'ModuleValue',
+
+    'ClassValue',
+
+    'FunctionValue',
+    'MethodValue',
+
+    'AnonymousInstance',
+    'BoundMethod',
+    'CompiledInstance',
+    'AbstractInstanceValue',
+    'TreeInstance',
+)
diff --git a/jedi/inference/value/instance.py b/jedi/inference/value/instance.py
index 153ab4f4..9514e01d 100644
--- a/jedi/inference/value/instance.py
+++ b/jedi/inference/value/instance.py
@@ -1,6 +1,6 @@
 from abc import abstractproperty
 
-from parso.python.tree import search_ancestor
+from parso.tree import search_ancestor
 
 from jedi import debug
 from jedi import settings
diff --git a/jedi/plugins/pytest.py b/jedi/plugins/pytest.py
index 432385e3..cec23733 100644
--- a/jedi/plugins/pytest.py
+++ b/jedi/plugins/pytest.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from parso.python.tree import search_ancestor
+from parso.tree import search_ancestor
 from jedi.inference.cache import inference_state_method_cache
 from jedi.inference.imports import load_module_from_path
 from jedi.inference.filters import ParserTreeFilter