move evaluate and evaluate_representation to evaluate folder

jedi/api.py

@@ -25,10 +25,10 @@ from jedi import cache
 from jedi import modules
 from jedi import interpret
 from jedi._compatibility import next, unicode, builtins
+from jedi import evaluate
+from jedi.evaluate import representation as er
 import keywords
-import evaluate
 import api_classes
-import evaluate_representation as er
 import dynamic
 import imports
 import builtin

jedi/api_classes.py

@@ -13,12 +13,12 @@ from jedi import settings
 from jedi import common
 from jedi.parser import representation as pr
 from jedi import cache
+from jedi import evaluate
+from jedi import representation as er
 import keywords
 import recursion
 import dynamic
-import evaluate
 import imports
-import evaluate_representation as er
 
 
 def _clear_caches():

jedi/docstrings.py

@@ -18,8 +18,8 @@ import re
 
 from jedi import cache
 from jedi.parser import Parser
-import evaluate
-import evaluate_representation as er
+from jedi import evaluate
+from jedi.evaluate import representation as er
 
 DOCSTRING_PARAM_PATTERNS = [
     r'\s*:type\s+%s:\s*([^\n]+)',  # Sphinx

jedi/evaluate/__init__.py

@@ -78,7 +78,7 @@ from jedi import common
 from jedi import cache
 from jedi.parser import representation as pr
 from jedi import debug
-import evaluate_representation as er
+from jedi.evaluate import representation as er
 import recursion
 import docstrings
 import builtin

jedi/evaluate/representation.py

@@ -23,7 +23,6 @@ from jedi import common
 import recursion
 import docstrings
 import imports
-import evaluate
 import builtin
 import dynamic
 

jedi/imports.py

@@ -25,7 +25,6 @@ from jedi import debug
 from jedi.parser import representation as pr
 from jedi import cache
 import builtin
-import evaluate
 
 # for debugging purposes only
 imports_processed = 0

jedi/recursion.py

@@ -10,7 +10,7 @@ calls.
 from jedi.parser import representation as pr
 from jedi import debug
 from jedi import settings
-import evaluate_representation as er
+from jedi.evaluate import representation as er
 import builtin