From 4e68856cc448031deef651e86626f3f2e9a32de1 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Tue, 24 Dec 2013 16:12:07 +0100
Subject: [PATCH] move builtin and imports into the evaluate directory

---
 jedi/api.py                    | 6 +++---
 jedi/api_classes.py            | 4 ++--
 jedi/dynamic.py                | 2 +-
 jedi/{ => evaluate}/builtin.py | 0
 jedi/{ => evaluate}/imports.py | 2 +-
 jedi/keywords.py               | 2 +-
 jedi/recursion.py              | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename jedi/{ => evaluate}/builtin.py (100%)
 rename jedi/{ => evaluate}/imports.py (99%)

diff --git a/jedi/api.py b/jedi/api.py
index b4c7c13c..9dd49bad 100644
--- a/jedi/api.py
+++ b/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):
diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index 6eb8dca7..45573f2f 100644
--- a/jedi/api_classes.py
+++ b/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():
diff --git a/jedi/dynamic.py b/jedi/dynamic.py
index e62f736f..3d59c403 100644
--- a/jedi/dynamic.py
+++ b/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.
diff --git a/jedi/builtin.py b/jedi/evaluate/builtin.py
similarity index 100%
rename from jedi/builtin.py
rename to jedi/evaluate/builtin.py
diff --git a/jedi/imports.py b/jedi/evaluate/imports.py
similarity index 99%
rename from jedi/imports.py
rename to jedi/evaluate/imports.py
index a28b94e0..4c646e5b 100644
--- a/jedi/imports.py
+++ b/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
diff --git a/jedi/keywords.py b/jedi/keywords.py
index 23f2ffb6..19abde64 100644
--- a/jedi/keywords.py
+++ b/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
diff --git a/jedi/recursion.py b/jedi/recursion.py
index 41e22d3d..d9407e51 100644
--- a/jedi/recursion.py
+++ b/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):