Upgrade isort (#5817)

blueyed · tomchristie · commit 2854679f5632 · 2018-02-14T20:12:14.000Z
* Fix isort

* runtests: add --diff to ISORT_ARGS

* requirements-codestyle: bump isort to 4.3.3

* isort: move config to setup.cfg
diff --git a/.isort.cfg b/.isort.cfg
diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt
@@ -4,4 +4,4 @@ flake8-tidy-imports==1.1.0
 pycodestyle==2.3.1
 
 # Sort and lint imports
-isort==4.2.15
+isort==4.3.3
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -11,8 +11,8 @@
 from collections import OrderedDict
 
 from django.conf import settings
-from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.validators import (
     EmailValidator, RegexValidator, URLValidator, ip_address_validators
 )
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
@@ -8,8 +8,8 @@
 from base64 import b64decode, b64encode
 from collections import OrderedDict, namedtuple
 
-from django.core.paginator import Paginator as DjangoPaginator
 from django.core.paginator import InvalidPage
+from django.core.paginator import Paginator as DjangoPaginator
 from django.template import loader
 from django.utils import six
 from django.utils.encoding import force_text
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
@@ -11,11 +11,10 @@
 from django.conf import settings
 from django.core.files.uploadhandler import StopFutureHandlers
 from django.http import QueryDict
+from django.http.multipartparser import ChunkIter
 from django.http.multipartparser import \
     MultiPartParser as DjangoMultiPartParser
-from django.http.multipartparser import (
-    ChunkIter, MultiPartParserError, parse_header
-)
+from django.http.multipartparser import MultiPartParserError, parse_header
 from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.six.moves.urllib import parse as urlparse
diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py
@@ -3,8 +3,8 @@
 """
 from __future__ import unicode_literals
 
-from django.urls import reverse as django_reverse
 from django.urls import NoReverseMatch
+from django.urls import reverse as django_reverse
 from django.utils import six
 from django.utils.functional import lazy
 
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -17,8 +17,8 @@
 import traceback
 from collections import Mapping, OrderedDict
 
-from django.core.exceptions import ValidationError as DjangoValidationError
 from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ValidationError as DjangoValidationError
 from django.db import models
 from django.db.models import DurationField as ModelDurationField
 from django.db.models.fields import Field as DjangoModelField
diff --git a/rest_framework/test.py b/rest_framework/test.py
@@ -12,8 +12,8 @@
 from django.core.handlers.wsgi import WSGIHandler
 from django.test import override_settings, testcases
 from django.test.client import Client as DjangoClient
-from django.test.client import RequestFactory as DjangoRequestFactory
 from django.test.client import ClientHandler
+from django.test.client import RequestFactory as DjangoRequestFactory
 from django.utils import six
 from django.utils.encoding import force_bytes
 from django.utils.http import urlencode
diff --git a/runtests.py b/runtests.py
@@ -13,7 +13,7 @@
 
 FLAKE8_ARGS = ['rest_framework', 'tests']
 
-ISORT_ARGS = ['--recursive', '--check-only', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests']
+ISORT_ARGS = ['--recursive', '--check-only', '--diff', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests']
 
 
 def exit_on_failure(ret, message=None):
diff --git a/setup.cfg b/setup.cfg
@@ -7,3 +7,11 @@ license_file = LICENSE.md
 [flake8]
 ignore = E501
 banned-modules = json = use from rest_framework.utils import json!
+
+[isort]
+skip=.tox
+atomic=true
+multi_line_output=5
+known_standard_library=types
+known_third_party=pytest,_pytest,django
+known_first_party=rest_framework
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import sys
 from io import open
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 try:
     from pypandoc import convert_file
diff --git a/tests/test_description.py b/tests/test_description.py
@@ -9,7 +9,6 @@
 from rest_framework.utils.formatting import dedent
 from rest_framework.views import APIView
 
-
 # We check that docstrings get nicely un-indented.
 DESCRIPTION = """an example docstring
 ====================

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`from collections import OrderedDict`
`12`	`12`
`13`	`13`	`from django.conf import settings`
`14`		`-from django.core.exceptions import ValidationError as DjangoValidationError`
`15`	`14`	`from django.core.exceptions import ObjectDoesNotExist`
	`15`	`+from django.core.exceptions import ValidationError as DjangoValidationError`
`16`	`16`	`from django.core.validators import (`
`17`	`17`	`EmailValidator, RegexValidator, URLValidator, ip_address_validators`
`18`	`18`	`)`