diff --git a/jedi/api.py b/jedi/api.py index 35926fb6..acb7b5f5 100644 --- a/jedi/api.py +++ b/jedi/api.py @@ -22,17 +22,17 @@ from jedi.parser import fast from jedi.parser.user_context import UserContext from jedi import debug from jedi import settings -from jedi import helpers from jedi import common from jedi import cache from jedi import interpret from jedi import keywords +from jedi import api_classes from jedi.evaluate import Evaluator, filter_private_variable from jedi.evaluate import representation as er from jedi.evaluate import builtin from jedi.evaluate import imports from jedi.evaluate import dynamic -from jedi import api_classes +from jedi.evaluate import helpers class NotFoundError(Exception): diff --git a/jedi/helpers.py b/jedi/evaluate/helpers.py similarity index 100% rename from jedi/helpers.py rename to jedi/evaluate/helpers.py diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index dcbd24f4..54ebd9c2 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -13,14 +13,14 @@ import copy from jedi._compatibility import use_metaclass, next, unicode from jedi.parser import representation as pr -from jedi import helpers from jedi import debug from jedi import common +from jedi.evaluate.cache import memoize_default, CachedMetaClass from jedi.evaluate import builtin from jedi.evaluate import recursion -from jedi.evaluate.cache import memoize_default, CachedMetaClass from jedi.evaluate import iterable from jedi.evaluate import docstrings +from jedi.evaluate import helpers class Executable(pr.IsScope): diff --git a/jedi/refactoring.py b/jedi/refactoring.py index 7727c309..7ff38cba 100644 --- a/jedi/refactoring.py +++ b/jedi/refactoring.py @@ -17,7 +17,7 @@ from __future__ import with_statement import difflib from jedi import common -from jedi import helpers +from jedi.evaluate import helpers from jedi.parser import representation as pr