From c65c5e4b2c962c4021eab958dc0874bbe1d19377 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 1 Jun 2016 13:20:45 +0100 Subject: [PATCH] Correct sorting of import statements. --- tests/browsable_api/test_browsable_api.py | 2 +- tests/test_atomic_requests.py | 2 +- tests/test_authentication.py | 2 +- tests/test_generics.py | 6 +++--- tests/test_htmlrenderer.py | 2 +- tests/test_multitable_inheritance.py | 2 +- tests/test_permissions.py | 2 +- tests/test_relations_hyperlink.py | 8 ++++---- tests/test_relations_pk.py | 4 ++-- tests/test_relations_slug.py | 4 ++-- tests/test_renderers.py | 2 +- tests/test_request.py | 2 +- tests/test_response.py | 4 ++-- tests/test_reverse.py | 2 +- tests/test_routers.py | 2 +- tests/test_testing.py | 2 +- tests/test_utils.py | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 09b29ae1b..3d49c353b 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from rest_framework.test import APIClient diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 8342ad3af..3e1d41725 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -7,13 +7,13 @@ from django.db import connection, connections, transaction from django.http import Http404 from django.test import TestCase, TransactionTestCase from django.utils.decorators import method_decorator +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_authentication.py b/tests/test_authentication.py index 0330e5092..b6377f6e8 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -8,7 +8,7 @@ from django.conf.urls import include, url from django.contrib.auth.models import User from django.db import models from django.http import HttpResponse -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from django.utils import six from rest_framework import ( diff --git a/tests/test_generics.py b/tests/test_generics.py index 2e47df50f..b81a02fc3 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -5,13 +5,13 @@ from django.db import models from django.shortcuts import get_object_or_404 from django.test import TestCase from django.utils import six +from tests.models import ( + BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel +) 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 -) factory = APIRequestFactory() diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index 649a7c919..3dfe6ef74 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -5,7 +5,7 @@ from django.conf.urls import url from django.core.exceptions import PermissionDenied from django.http import Http404 from django.template import Template, TemplateDoesNotExist -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from django.utils import six from rest_framework import status diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 340d4966a..5867f1966 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals 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_permissions.py b/tests/test_permissions.py index e04c72ec9..f36b8f4da 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -7,6 +7,7 @@ from django.contrib.auth.models import Group, Permission, User from django.core.urlresolvers import ResolverMatch from django.db import models from django.test import TestCase +from tests.models import BasicModel from rest_framework import ( HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers, @@ -16,7 +17,6 @@ from rest_framework.compat import guardian 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 0eb22b2aa..27e1d1449 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,15 +1,15 @@ from __future__ import unicode_literals from django.conf.urls import url -from django.test import override_settings, TestCase - -from rest_framework import serializers -from rest_framework.test import APIRequestFactory +from django.test import TestCase, override_settings 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 ba75bd94f..c82188ede 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.test import TestCase from django.utils import six - -from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, NullableForeignKeySource, NullableOneToOneSource, NullableUUIDForeignKeySource, OneToOneTarget, 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 680aee417..cee18031d 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_renderers.py b/tests/test_renderers.py index ca8eb0cff..5793fc734 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -8,7 +8,7 @@ from collections import MutableMapping, OrderedDict from django.conf.urls import include, url from django.core.cache import cache from django.db import models -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from django.utils import six from django.utils.safestring import SafeText from django.utils.translation import ugettext_lazy as _ diff --git a/tests/test_request.py b/tests/test_request.py index 8219bd4ec..dee636d76 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -7,7 +7,7 @@ from django.conf.urls import url from django.contrib.auth import authenticate, login, logout from django.contrib.auth.models import User from django.contrib.sessions.middleware import SessionMiddleware -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from django.utils import six from rest_framework import status diff --git a/tests/test_response.py b/tests/test_response.py index f01b05774..28ea90ce4 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -1,8 +1,9 @@ from __future__ import unicode_literals from django.conf.urls import include, url -from django.test import override_settings, TestCase +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 @@ -11,7 +12,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_reverse.py b/tests/test_reverse.py index 0962efaf3..03d31f1f9 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.conf.urls import url from django.core.urlresolvers import NoReverseMatch -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from rest_framework.reverse import reverse from rest_framework.test import APIRequestFactory diff --git a/tests/test_routers.py b/tests/test_routers.py index ae4670802..acab660d8 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -5,7 +5,7 @@ from collections import namedtuple from django.conf.urls import include, url from django.core.exceptions import ImproperlyConfigured from django.db import models -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from rest_framework import permissions, serializers, viewsets from rest_framework.decorators import detail_route, list_route diff --git a/tests/test_testing.py b/tests/test_testing.py index 4fd20c33b..e6c8de22d 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -6,7 +6,7 @@ from io import BytesIO from django.conf.urls import url from django.contrib.auth.models import User from django.shortcuts import redirect -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from rest_framework.decorators import api_view from rest_framework.response import Response diff --git a/tests/test_utils.py b/tests/test_utils.py index adb735511..70ba7644a 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured -from django.test import override_settings, TestCase +from django.test import TestCase, override_settings from django.utils import six +from tests.models import BasicModel import rest_framework.utils.model_meta from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.utils.model_meta import _resolve_model from rest_framework.views import APIView -from tests.models import BasicModel class Root(APIView):