summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2015-07-13 00:40:33 -0700
committerTimothy Crosley <timothy.crosley@gmail.com>2015-07-13 00:40:33 -0700
commit48718ce5cc6303d16a642677306bf196001ed196 (patch)
treec5303edff4c87740cd07c61e633530631d6a61c5
parent12829777b6dd4f38926a3450eca01ba86d629aed (diff)
downloadisort-48718ce5cc6303d16a642677306bf196001ed196.tar.gz
Sort isort
-rw-r--r--isort/isort.py3
-rwxr-xr-xisort/main.py3
-rw-r--r--isort/settings.py2
-rw-r--r--test_isort.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/isort/isort.py b/isort/isort.py
index 274be1cf..1fd5f8be 100644
--- a/isort/isort.py
+++ b/isort/isort.py
@@ -38,11 +38,10 @@ from difflib import unified_diff
from sys import path as PYTHONPATH
from sys import stderr, stdout
+from . import settings
from .natural import nsorted
from .pie_slice import *
-from . import settings
-
KNOWN_SECTION_MAPPING = {
'STDLIB': 'STANDARD_LIBRARY',
'FUTURE': 'FUTURE_LIBRARY',
diff --git a/isort/main.py b/isort/main.py
index 86270675..b1e1ed48 100755
--- a/isort/main.py
+++ b/isort/main.py
@@ -26,11 +26,12 @@ import os
import sys
import setuptools
-from .pie_slice import *
from isort import SortImports, __version__
from isort.settings import DEFAULT_SECTIONS, default, from_path
+from .pie_slice import *
+
def iter_source_code(paths):
"""Iterate over all Python source files defined in paths."""
diff --git a/isort/settings.py b/isort/settings.py
index a14fa115..3a36681e 100644
--- a/isort/settings.py
+++ b/isort/settings.py
@@ -84,7 +84,7 @@ default = {'force_to_top': [],
'import_heading_localfolder': '',
'balanced_wrapping': False,
'use_parentheses': False,
- 'order_by_type': True,
+ 'order_by_type': False,
'atomic': False,
'lines_after_imports': -1,
'combine_as_imports': False,
diff --git a/test_isort.py b/test_isort.py
index d7a91887..756b1932 100644
--- a/test_isort.py
+++ b/test_isort.py
@@ -23,13 +23,13 @@ OTHER DEALINGS IN THE SOFTWARE.
"""
from __future__ import absolute_import, division, print_function, unicode_literals
-from isort.pie_slice import *
import codecs
import os
import shutil
import tempfile
from isort.isort import SortImports
+from isort.pie_slice import *
from isort.settings import WrapModes
SHORT_IMPORT = "from third_party import lib1, lib2, lib3, lib4"