From 436771aba5f1881817221da178352c71aea045fb Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Wed, 15 Jul 2020 19:25:59 +0200
Subject: [PATCH] Use isort v5 (#999)

---
 requirements.txt         | 2 +-
 scripts/lint             | 2 +-
 scripts/test             | 2 +-
 starlette/formparsers.py | 2 +-
 starlette/graphql.py     | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4061b3955..d63dd35b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ ujson
 autoflake
 black
 databases[sqlite]
-isort
+isort==5.*
 mypy
 pytest
 pytest-cov
diff --git a/scripts/lint b/scripts/lint
index 06e320938..26fbed90e 100755
--- a/scripts/lint
+++ b/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
diff --git a/scripts/test b/scripts/test
index 8c4ada036..366c238e3 100755
--- a/scripts/test
+++ b/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
diff --git a/starlette/formparsers.py b/starlette/formparsers.py
index e1b9efa26..b4b731eef 100644
--- a/starlette/formparsers.py
+++ b/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
diff --git a/starlette/graphql.py b/starlette/graphql.py
index d3a64279e..b5eeeafa2 100644
--- a/starlette/graphql.py
+++ b/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