summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2019-12-14 23:52:55 -0800
committerTimothy Crosley <timothy.crosley@gmail.com>2019-12-14 23:52:55 -0800
commitbbfea1a2551c1d2c7f5f53983936895f81f0fa7a (patch)
tree8cd8aab22d6165582ef80bea61f5c934599ac88d
parentf9113bbbde3d8fd9328801ef5a9d4fe855e44c14 (diff)
downloadisort-bbfea1a2551c1d2c7f5f53983936895f81f0fa7a.tar.gz
Formatting
-rw-r--r--isort/api.py19
-rw-r--r--isort/parse.py12
2 files changed, 13 insertions, 18 deletions
diff --git a/isort/api.py b/isort/api.py
index c2c2c78d..6d93f233 100644
--- a/isort/api.py
+++ b/isort/api.py
@@ -1,6 +1,6 @@
import re
from pathlib import Path
-from typing import Any, NamedTuple, Optional, Tuple, TextIO
+from typing import Any, NamedTuple, Optional, TextIO, Tuple
from . import output, parse
from .exceptions import (
@@ -126,7 +126,10 @@ def sorted_file(filename: str, config: Config = DEFAULT_CONFIG, **config_kwargs)
def sort_imports(
- input_stream: TextIO, output_stream: TextIO, extension: str = "py", config: Config = DEFAULT_CONFIG,
+ input_stream: TextIO,
+ output_stream: TextIO,
+ extension: str = "py",
+ config: Config = DEFAULT_CONFIG,
) -> None:
"""Parses stream identifying sections of contiguous imports and sorting them
@@ -173,10 +176,10 @@ def sort_imports(
import_section += line
elif stripped_line.startswith(IMPORT_START_IDENTIFIERS):
import_section += line
- if "(" in stripped_line and not ")" in stripped_line:
+ if "(" in stripped_line and ")" not in stripped_line:
nested_line = line
nested_stripped_line = nested_line.strip().split("#")[0]
- while not ")" in nested_stripped_line:
+ while ")" not in nested_stripped_line:
nested_line = input_stream.readline()
nested_stripped_line = nested_line.strip()
import_section += nested_line
@@ -199,9 +202,11 @@ def sort_imports(
if not contains_imports:
output_stream.write(import_section)
else:
- output_stream.write(output.sorted_imports(
- parse.file_contents(import_section, config=config), config, extension
- ))
+ output_stream.write(
+ output.sorted_imports(
+ parse.file_contents(import_section, config=config), config, extension
+ )
+ )
contains_imports = False
import_section = ""
else:
diff --git a/isort/parse.py b/isort/parse.py
index 0d1ba875..c2a835d5 100644
--- a/isort/parse.py
+++ b/isort/parse.py
@@ -2,17 +2,7 @@
from collections import OrderedDict, defaultdict, namedtuple
from io import StringIO
from itertools import chain
-from typing import (
- TYPE_CHECKING,
- Any,
- Dict,
- Generator,
- Iterator,
- List,
- NamedTuple,
- Optional,
- Tuple,
-)
+from typing import TYPE_CHECKING, Any, Dict, Generator, Iterator, List, NamedTuple, Optional, Tuple
from warnings import warn
from isort.format import format_natural