Upgrade isort (#5817)

* Fix isort

* runtests: add --diff to ISORT_ARGS

* requirements-codestyle: bump isort to 4.3.3

* isort: move config to setup.cfg

Author: blueyed

.isort.cfg

@@ -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

requirements/requirements-codestyle.txt

@@ -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
 )

rest_framework/fields.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

rest_framework/pagination.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

rest_framework/parsers.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
 

rest_framework/reverse.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

rest_framework/serializers.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

rest_framework/test.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):

runtests.py

@@ -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

setup.cfg

@@ -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

setup.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
 ====================