some corrections of imports

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
 
 

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

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

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

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

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

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
 
 

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