move some imports around

This commit is contained in:
Dave Halter
2013-12-30 01:49:01 +01:00
parent 7b936cf6ec
commit 6ece1de22d
2 changed files with 5 additions and 4 deletions

View File

@@ -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

View File

@@ -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