move builtin and imports into the evaluate directory

jedi/api.py

@@ -27,11 +27,11 @@ from jedi import interpret
 from jedi._compatibility import next, unicode, builtins
 from jedi.evaluate import Evaluator
 from jedi.evaluate import representation as er
-import keywords
+from jedi import keywords
+from jedi.evaluate import builtin
+from jedi.evaluate import imports
 import api_classes
 import dynamic
-import imports
-import builtin
 
 
 class NotFoundError(Exception):

jedi/api_classes.py

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

jedi/dynamic.py

@@ -62,7 +62,7 @@ from jedi import settings
 from jedi import common
 from jedi import debug
 from jedi.parser import fast as fast_parser
-import imports
+from jedi.evaluate import imports
 
 # This is something like the sys.path, but only for searching params. It means
 # that this is the order in which Jedi searches params.

jedi/evaluate/imports.py

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

jedi/keywords.py

@@ -6,7 +6,7 @@ import keyword
 from jedi._compatibility import is_py3k
 from jedi.parser import representation as pr
 from jedi import common
-import builtin
+from jedi.evaluate import builtin
 
 try:
     from pydoc_data import topics as pydoc_topics

jedi/recursion.py

@@ -10,7 +10,7 @@ calls.
 from jedi.parser import representation as pr
 from jedi import debug
 from jedi import settings
-import builtin
+from jedi.evaluate import builtin
 
 
 class RecursionDecorator(object):