From 6ece1de22dc2b842c428e9c63fafee078bcc2c55 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Mon, 30 Dec 2013 01:49:01 +0100
Subject: [PATCH] move some imports around

---
 jedi/evaluate/dynamic.py  | 2 +-
 jedi/evaluate/iterable.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jedi/evaluate/dynamic.py b/jedi/evaluate/dynamic.py
index 16a80c9e..9c728901 100644
--- a/jedi/evaluate/dynamic.py
+++ b/jedi/evaluate/dynamic.py
@@ -59,6 +59,7 @@ from jedi import modules
 from jedi import settings
 from jedi.parser import fast as fast_parser
 from jedi.evaluate.cache import memoize_default
+from jedi.evaluate import iterable
 
 # This is something like the sys.path, but only for searching params. It means
 # that this is the order in which Jedi searches params.
@@ -294,7 +295,6 @@ def check_flow_information(evaluator, flow, search_name, pos):
 
 
 def _check_isinstance_type(evaluator, stmt, search_name):
-    from jedi.evaluate import iterable
     try:
         expression_list = stmt.expression_list()
         # this might be removed if we analyze and, etc
diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py
index c79695a0..b12624e5 100644
--- a/jedi/evaluate/iterable.py
+++ b/jedi/evaluate/iterable.py
@@ -6,7 +6,6 @@ from jedi import settings
 from jedi._compatibility import use_metaclass
 from jedi.parser import representation as pr
 from jedi.evaluate import builtin
-from jedi.evaluate import dynamic
 from jedi.evaluate.cache import CachedMetaClass, memoize_default
 
 
@@ -248,11 +247,10 @@ def _check_array_additions(evaluator, compare_array, module, is_list):
 
     from jedi.evaluate import representation as er
     from jedi import evaluate
-    from jedi.evaluate import iterable
 
     def get_execution_parent(element, *stop_classes):
         """ Used to get an Instance/FunctionExecution parent """
-        if isinstance(element, iterable.Array):
+        if isinstance(element, Array):
             stmt = element._array.parent
         else:
             # is an Instance with an ArrayInstance inside
@@ -293,6 +291,9 @@ def _check_array_additions(evaluator, compare_array, module, is_list):
             if evaluator.recursion_detector.push_stmt(stmt):
                 # check recursion
                 continue
+
+            # TODO should be deleted in the future
+            from jedi.evaluate import dynamic
             res += check_calls(dynamic._scan_statement(stmt, n), n)
             evaluator.recursion_detector.pop_stmt()
     # reset settings