From b1b56eef1a23dec5dad118e654087579ddc467fc Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Wed, 6 Mar 2019 20:20:40 +0600 Subject: [PATCH] fixed isort failures --- tests/browsable_api/test_form_rendering.py | 2 +- tests/generic_relations/test_generic_relations.py | 1 - tests/importable/test_installed.py | 1 - tests/test_atomic_requests.py | 2 +- tests/test_generics.py | 8 ++++---- tests/test_multitable_inheritance.py | 2 +- tests/test_one_to_one_with_inheritance.py | 4 ++-- tests/test_permissions.py | 2 +- tests/test_relations_hyperlink.py | 6 +++--- tests/test_relations_pk.py | 4 ++-- tests/test_relations_slug.py | 4 ++-- tests/test_response.py | 2 +- tests/test_utils.py | 2 +- 13 files changed, 19 insertions(+), 21 deletions(-) diff --git a/tests/browsable_api/test_form_rendering.py b/tests/browsable_api/test_form_rendering.py index d8378a2ca..ff2d0e05a 100644 --- a/tests/browsable_api/test_form_rendering.py +++ b/tests/browsable_api/test_form_rendering.py @@ -1,9 +1,9 @@ from django.test import TestCase +from tests.models import BasicModel from rest_framework import generics, renderers, serializers, status from rest_framework.response import Response from rest_framework.test import APIRequestFactory -from tests.models import BasicModel factory = APIRequestFactory() diff --git a/tests/generic_relations/test_generic_relations.py b/tests/generic_relations/test_generic_relations.py index dce4f1ce5..c6f2b0de4 100644 --- a/tests/generic_relations/test_generic_relations.py +++ b/tests/generic_relations/test_generic_relations.py @@ -3,7 +3,6 @@ from django.contrib.contenttypes.fields import ( ) from django.contrib.contenttypes.models import ContentType from django.db import models - from django.test import TestCase from rest_framework import serializers diff --git a/tests/importable/test_installed.py b/tests/importable/test_installed.py index 072d3b2e4..fff51fd8f 100644 --- a/tests/importable/test_installed.py +++ b/tests/importable/test_installed.py @@ -1,5 +1,4 @@ from django.conf import settings - from tests import importable diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 0e807dec0..aba54bf70 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -4,13 +4,13 @@ from django.conf.urls import url from django.db import connection, connections, transaction from django.http import Http404 from django.test import TestCase, TransactionTestCase, override_settings +from tests.models import BasicModel from rest_framework import status from rest_framework.exceptions import APIException from rest_framework.response import Response from rest_framework.test import APIRequestFactory from rest_framework.views import APIView -from tests.models import BasicModel factory = APIRequestFactory() diff --git a/tests/test_generics.py b/tests/test_generics.py index a7a4a68d2..74e760307 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -4,15 +4,15 @@ from django.http import Http404 from django.shortcuts import get_object_or_404 from django.test import TestCase from django.utils import six - -from rest_framework import generics, renderers, serializers, status -from rest_framework.response import Response -from rest_framework.test import APIRequestFactory from tests.models import ( BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel, UUIDForeignKeyTarget ) +from rest_framework import generics, renderers, serializers, status +from rest_framework.response import Response +from rest_framework.test import APIRequestFactory + factory = APIRequestFactory() diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 1e8ab3448..772bc69d6 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -1,8 +1,8 @@ from django.db import models from django.test import TestCase +from tests.models import RESTFrameworkModel from rest_framework import serializers -from tests.models import RESTFrameworkModel # Models diff --git a/tests/test_one_to_one_with_inheritance.py b/tests/test_one_to_one_with_inheritance.py index 40793d7ca..35758544c 100644 --- a/tests/test_one_to_one_with_inheritance.py +++ b/tests/test_one_to_one_with_inheritance.py @@ -1,11 +1,11 @@ from django.db import models from django.test import TestCase - -from rest_framework import serializers from tests.models import RESTFrameworkModel # Models from tests.test_multitable_inheritance import ChildModel +from rest_framework import serializers + # Regression test for #4290 class ChildAssociatedModel(RESTFrameworkModel): diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 0ee3f1e0a..c53dae18b 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -8,6 +8,7 @@ from django.contrib.auth.models import AnonymousUser, Group, Permission, User from django.db import models from django.test import TestCase from django.urls import ResolverMatch +from tests.models import BasicModel from rest_framework import ( HTTP_HEADER_ENCODING, RemovedInDRF310Warning, authentication, generics, @@ -17,7 +18,6 @@ from rest_framework.compat import PY36, is_guardian_installed, mock from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.routers import DefaultRouter from rest_framework.test import APIRequestFactory -from tests.models import BasicModel factory = APIRequestFactory() diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 5ad0e31ff..2cc0e45e2 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,13 +1,13 @@ from django.conf.urls import url from django.test import TestCase, override_settings - -from rest_framework import serializers -from rest_framework.test import APIRequestFactory from tests.models import ( ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget ) +from rest_framework import serializers +from rest_framework.test import APIRequestFactory + factory = APIRequestFactory() request = factory.get('/') # Just to ensure we have a request in the serializer context diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 57b43cf53..c5e5629b7 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -1,7 +1,5 @@ from django.test import TestCase from django.utils import six - -from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeySourceWithLimitedChoices, ForeignKeySourceWithQLimitedChoices, ForeignKeyTarget, ManyToManySource, @@ -10,6 +8,8 @@ from tests.models import ( UUIDForeignKeyTarget ) +from rest_framework import serializers + # ManyToMany class ManyToManyTargetSerializer(serializers.ModelSerializer): diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py index 0b9ca79d3..d79eb8627 100644 --- a/tests/test_relations_slug.py +++ b/tests/test_relations_slug.py @@ -1,10 +1,10 @@ from django.test import TestCase - -from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeyTarget, NullableForeignKeySource ) +from rest_framework import serializers + class ForeignKeyTargetSerializer(serializers.ModelSerializer): sources = serializers.SlugRelatedField( diff --git a/tests/test_response.py b/tests/test_response.py index 63d65b4b3..66fce9aec 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -1,6 +1,7 @@ from django.conf.urls import include, url from django.test import TestCase, override_settings from django.utils import six +from tests.models import BasicModel from rest_framework import generics, routers, serializers, status, viewsets from rest_framework.parsers import JSONParser @@ -9,7 +10,6 @@ from rest_framework.renderers import ( ) from rest_framework.response import Response from rest_framework.views import APIView -from tests.models import BasicModel # Serializer used to test BasicModel diff --git a/tests/test_utils.py b/tests/test_utils.py index a6f8b9d16..17c1a9bef 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,5 +1,6 @@ from django.conf.urls import url from django.test import TestCase, override_settings +from tests.models import BasicModel from rest_framework.decorators import action from rest_framework.routers import SimpleRouter @@ -9,7 +10,6 @@ from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.utils.urls import remove_query_param, replace_query_param from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet -from tests.models import BasicModel class Root(APIView):