summaryrefslogtreecommitdiff
path: root/isort/output.py
diff options
context:
space:
mode:
authorTimothy Edmund Crosley <timothy.crosley@gmail.com>2020-01-07 12:15:29 -0800
committerGitHub <noreply@github.com>2020-01-07 12:15:29 -0800
commit9b654e379e4f92ee0bd73c079e2b5c11ed969ed1 (patch)
tree842935f99d75709a0a77504e15edabdf299bb671 /isort/output.py
parent3c2d7976501bbe471fe4c8aea2d3d67807a65303 (diff)
parentad49f79cfd88807190e20d664a799e8a660a79d8 (diff)
downloadisort-9b654e379e4f92ee0bd73c079e2b5c11ed969ed1.tar.gz
Merge pull request #1085 from timothycrosley/feature/fix-issue-969
Fix issue #969: Add support for single line exclusions
Diffstat (limited to 'isort/output.py')
-rw-r--r--isort/output.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/isort/output.py b/isort/output.py
index cd925c91..27fbd397 100644
--- a/isort/output.py
+++ b/isort/output.py
@@ -239,7 +239,9 @@ def _with_from_imports(
import_start = f"from {module} {import_type} "
from_imports = list(parsed.imports[section]["from"][module])
- if not config.no_inline_sort or config.force_single_line:
+ if not config.no_inline_sort or (
+ config.force_single_line and module not in config.single_line_exclusions
+ ):
from_imports = sorting.naturally(
from_imports,
key=lambda key: sorting.module_key(
@@ -288,7 +290,7 @@ def _with_from_imports(
config,
)
from_imports = []
- elif config.force_single_line:
+ elif config.force_single_line and module not in config.single_line_exclusions:
import_statement = ""
while from_imports:
from_import = from_imports.pop(0)