From b6bb251c968ad8aad2b3d1aa784134cfddd87035 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Sat, 30 Sep 2017 18:19:25 +0200
Subject: [PATCH] Common instance objects are now directly accessible

---
 jedi/evaluate/__init__.py          | 4 ++--
 jedi/evaluate/compiled/__init__.py | 2 +-
 jedi/evaluate/context/__init__.py  | 2 ++
 jedi/evaluate/context/klass.py     | 4 ++--
 jedi/evaluate/finder.py            | 2 +-
 jedi/evaluate/syntax_tree.py       | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 702c6b70..b726bd25 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -79,9 +79,9 @@ from jedi.evaluate import helpers
 from jedi.evaluate.filters import TreeNameDefinition, ParamName
 from jedi.evaluate.base_context import ContextualizedName, ContextualizedNode, \
     ContextSet, NO_CONTEXTS, iterate_contexts
-from jedi.evaluate.context import ClassContext, FunctionContext
+from jedi.evaluate.context import ClassContext, FunctionContext, \
+    AnonymousInstance, BoundMethod
 from jedi.evaluate.context.iterable import CompForContext
-from jedi.evaluate.context.instance import AnonymousInstance, BoundMethod
 from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \
     eval_node, check_tuple_assignments
 
diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py
index 151c5e46..b29c080e 100644
--- a/jedi/evaluate/compiled/__init__.py
+++ b/jedi/evaluate/compiled/__init__.py
@@ -83,7 +83,7 @@ class CompiledObject(Context):
     @CheckAttribute
     def py__call__(self, params):
         if inspect.isclass(self.obj):
-            from jedi.evaluate.context.instance import CompiledInstance
+            from jedi.evaluate.context import CompiledInstance
             return ContextSet(CompiledInstance(self.evaluator, self.parent_context, self, params))
         else:
             return ContextSet.from_iterable(self._execute_function(params))
diff --git a/jedi/evaluate/context/__init__.py b/jedi/evaluate/context/__init__.py
index 50feaca9..4e7ce4d6 100644
--- a/jedi/evaluate/context/__init__.py
+++ b/jedi/evaluate/context/__init__.py
@@ -1,3 +1,5 @@
 from jedi.evaluate.context.module import ModuleContext
 from jedi.evaluate.context.klass import ClassContext
 from jedi.evaluate.context.function import FunctionContext, FunctionExecutionContext
+from jedi.evaluate.context.instance import AnonymousInstance, BoundMethod, \
+    CompiledInstance, AbstractInstanceContext, TreeInstance
diff --git a/jedi/evaluate/context/klass.py b/jedi/evaluate/context/klass.py
index a10f24d5..a040b33a 100644
--- a/jedi/evaluate/context/klass.py
+++ b/jedi/evaluate/context/klass.py
@@ -142,14 +142,14 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)):
             return [LazyKnownContext(compiled.create(self.evaluator, object))]
 
     def py__call__(self, params):
-        from jedi.evaluate.context.instance import TreeInstance
+        from jedi.evaluate.context import TreeInstance
         return ContextSet(TreeInstance(self.evaluator, self.parent_context, self, params))
 
     def py__class__(self):
         return compiled.create(self.evaluator, type)
 
     def get_params(self):
-        from jedi.evaluate.context.instance import AnonymousInstance
+        from jedi.evaluate.context import AnonymousInstance
         anon = AnonymousInstance(self.evaluator, self.parent_context, self)
         return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()]
 
diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py
index 8c6b5b63..efc36954 100644
--- a/jedi/evaluate/finder.py
+++ b/jedi/evaluate/finder.py
@@ -19,7 +19,7 @@ from parso.python import tree
 from parso.tree import search_ancestor
 from jedi import debug
 from jedi import settings
-from jedi.evaluate.context.instance import AbstractInstanceContext
+from jedi.evaluate.context import AbstractInstanceContext
 from jedi.evaluate import compiled
 from jedi.evaluate import analysis
 from jedi.evaluate import flow_analysis
diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py
index 8a056eb6..ed1b4db8 100644
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -19,7 +19,7 @@ from jedi.evaluate import imports
 from jedi.evaluate import param
 from jedi.evaluate.context import ClassContext, FunctionContext
 from jedi.evaluate.context import iterable
-from jedi.evaluate.context.instance import TreeInstance, CompiledInstance
+from jedi.evaluate.context import TreeInstance, CompiledInstance
 from jedi.evaluate.finder import NameFinder
 from jedi.evaluate.helpers import is_string, is_literal, is_number, is_compiled