From 7b6a4c9a2b6b798bed370351584889952cafe8d6 Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Fri, 15 Mar 2013 16:01:23 +0430
Subject: [PATCH] some corrections of imports

---
 jedi/api.py                     | 6 +++---
 jedi/api_classes.py             | 4 ++--
 jedi/dynamic.py                 | 2 +-
 jedi/evaluate.py                | 4 ++--
 jedi/evaluate_representation.py | 2 +-
 jedi/imports.py                 | 2 +-
 jedi/recursion.py               | 2 +-
 jedi/refactoring.py             | 3 ++-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/jedi/api.py b/jedi/api.py
index 429ec603..51c1071c 100644
--- a/jedi/api.py
+++ b/jedi/api.py
@@ -20,14 +20,14 @@ from jedi import settings
 from jedi import helpers
 from jedi import common
 from jedi import cache
-from jedi import api_classes
 from jedi import modules
-from jedi import keywords
 from jedi._compatibility import next, unicode
+import evaluate
+import keywords
+import api_classes
 import evaluate_representation as er
 import dynamic
 import imports
-import evaluate
 import builtin
 
 
diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index 25a4cf48..df63198d 100644
--- a/jedi/api_classes.py
+++ b/jedi/api_classes.py
@@ -10,11 +10,11 @@ import warnings
 import functools
 
 from jedi._compatibility import unicode, next
-from jedi import recursion
 from jedi import settings
 from jedi import parsing_representation as pr
-from jedi import keywords
 from jedi import cache
+import keywords
+import recursion
 import dynamic
 import evaluate
 import imports
diff --git a/jedi/dynamic.py b/jedi/dynamic.py
index 687c46da..8cc0b3eb 100644
--- a/jedi/dynamic.py
+++ b/jedi/dynamic.py
@@ -60,8 +60,8 @@ from jedi import parsing_representation as pr
 from jedi import modules
 from jedi import settings
 from jedi import debug
-from jedi import api_classes
 from jedi import fast_parser
+import api_classes
 import evaluate
 import imports
 import evaluate_representation as er
diff --git a/jedi/evaluate.py b/jedi/evaluate.py
index 016e7075..551852d7 100644
--- a/jedi/evaluate.py
+++ b/jedi/evaluate.py
@@ -77,9 +77,9 @@ from jedi import common
 from jedi import cache
 from jedi import parsing_representation as pr
 from jedi import debug
-from jedi import recursion
-import docstrings
 import evaluate_representation as er
+import recursion
+import docstrings
 import builtin
 import imports
 import dynamic
diff --git a/jedi/evaluate_representation.py b/jedi/evaluate_representation.py
index 31fba868..99fded99 100644
--- a/jedi/evaluate_representation.py
+++ b/jedi/evaluate_representation.py
@@ -18,7 +18,7 @@ from jedi import cache
 from jedi import helpers
 from jedi import debug
 from jedi import common
-from jedi import recursion
+import recursion
 import docstrings
 import imports
 import evaluate
diff --git a/jedi/imports.py b/jedi/imports.py
index 90c119cd..72a3d0f6 100644
--- a/jedi/imports.py
+++ b/jedi/imports.py
@@ -19,11 +19,11 @@ import os
 import pkgutil
 import imp
 import sys
+import itertools
 
 from jedi import modules
 from jedi import debug
 from jedi import parsing_representation as pr
-from jedi import itertools
 from jedi import cache
 import builtin
 import evaluate
diff --git a/jedi/recursion.py b/jedi/recursion.py
index cf623e61..1727897a 100644
--- a/jedi/recursion.py
+++ b/jedi/recursion.py
@@ -8,9 +8,9 @@ Next to :mod:`cache` this module also makes |jedi| not thread-safe. Why?
 calls.
 """
 from jedi import parsing_representation as pr
-from jedi import evaluate_representation as er
 from jedi import debug
 from jedi import settings
+import evaluate_representation as er
 import builtin
 
 
diff --git a/jedi/refactoring.py b/jedi/refactoring.py
index 0f3eeade..a724ec16 100644
--- a/jedi/refactoring.py
+++ b/jedi/refactoring.py
@@ -15,8 +15,9 @@ following functions (sometimes bug-prone):
 
 from __future__ import with_statement
 
+import difflib
+
 from jedi import modules
-from jedi import difflib
 from jedi import helpers
 from jedi import parsing_representation as pr