Use isort v5 (#999)

requirements.txt

@@ -12,7 +12,7 @@ ujson
 autoflake
 black
 databases[sqlite]
-isort
+isort==5.*
 mypy
 pytest
 pytest-cov

scripts/lint

@@ -10,5 +10,5 @@ set -x
 ${PREFIX}mypy starlette --ignore-missing-imports --disallow-untyped-defs
 ${PREFIX}autoflake --in-place --recursive starlette tests setup.py
 ${PREFIX}black starlette tests setup.py
-${PREFIX}isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --apply starlette tests setup.py
+${PREFIX}isort --profile=black --combine-as starlette tests setup.py
 ${PREFIX}mypy starlette --ignore-missing-imports --disallow-untyped-defs

scripts/test

@@ -13,5 +13,5 @@ set -x
 PYTHONPATH=. ${PREFIX}pytest --ignore venv --cov-config tests/.ignore_lifespan -W ignore::DeprecationWarning --cov=starlette --cov=tests --cov-fail-under=100 --cov-report=term-missing ${@}
 ${PREFIX}mypy starlette --ignore-missing-imports --disallow-untyped-defs
 ${PREFIX}autoflake --recursive starlette tests setup.py
-${PREFIX}isort --multi-line=3 --trailing-comma --force-grid-wrap=0 --combine-as --line-width 88 --recursive --check starlette tests setup.py
+${PREFIX}isort --profile=black --combine-as --check starlette tests setup.py
 ${PREFIX}black starlette tests setup.py --check

starlette/formparsers.py

@@ -5,8 +5,8 @@
 from starlette.datastructures import FormData, Headers, UploadFile
 
 try:
-    from multipart.multipart import parse_options_header
     import multipart
+    from multipart.multipart import parse_options_header
 except ImportError:  # pragma: nocover
     parse_options_header = None
     multipart = None

starlette/graphql.py

@@ -10,9 +10,8 @@
 
 try:
     import graphene
+    from graphql.error import GraphQLError, format_error as format_graphql_error
     from graphql.execution.executors.asyncio import AsyncioExecutor
-    from graphql.error import format_error as format_graphql_error
-    from graphql.error import GraphQLError
 except ImportError:  # pragma: nocover
     graphene = None
     AsyncioExecutor = None  # type: ignore