diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 253e331fe..b603b190a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -16,6 +16,7 @@ from django.views.generic import View from rest_framework import VERSION + def deprecated(since, message): current_version = [int(i) for i in VERSION.split('.')] diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 911e9adf5..4730623f7 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -215,11 +215,11 @@ class PageNumberPagination(BasePagination): value = getattr(api_settings, settings_key, None) if value is not None: setattr(self, attr_name, value) - deprecated((3,0,0), "The `%s` settings key is deprecated. " - "Use the `%s` attribute on the pagination class instead." % ( - settings_key, attr_name - ) - ) + deprecated((3, 0, 0), + "The `%s` settings key is deprecated. " + "Use the `%s` attribute on the pagination class instead." % ( + settings_key, attr_name) + ) for (view_attr, attr_name) in ( ('paginate_by', 'page_size'), @@ -230,11 +230,11 @@ class PageNumberPagination(BasePagination): value = getattr(view, view_attr, None) if value is not None: setattr(self, attr_name, value) - deprecated((3,0,0), "The `%s` view attribute is deprecated. " - "Use the `%s` attribute on the pagination class instead." % ( - view_attr, attr_name - ) - ) + deprecated((3, 0, 0), + "The `%s` view attribute is deprecated. " + "Use the `%s` attribute on the pagination class instead." % ( + view_attr, attr_name) + ) def paginate_queryset(self, queryset, request, view=None): """ diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index d0d088f52..89bc0ac66 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -6,13 +6,13 @@ from django.http import Http404 from django.test import TestCase, TransactionTestCase from django.utils.decorators import method_decorator from django.utils.unittest import skipUnless +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 000adffa7..4398febc3 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -6,13 +6,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_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 398020002..ac0ecab90 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -7,6 +7,7 @@ from django.core.urlresolvers import ResolverMatch from django.db import models from django.test import TestCase from django.utils import unittest +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 get_model_name, 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 c0642eda2..b203884d8 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.conf.urls import url from django.test import TestCase - -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 169f7d9c5..fb797e993 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -2,13 +2,13 @@ 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, OneToOneTarget ) +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_response.py b/tests/test_response.py index 1dd5d5ea0..84b0935d7 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from django.conf.urls import include, url from django.test import TestCase from django.utils import six +from tests.models import BasicModel from rest_framework import generics, routers, serializers, status, viewsets from rest_framework.renderers import ( @@ -11,7 +12,6 @@ from rest_framework.renderers import ( from rest_framework.response import Response from rest_framework.settings import api_settings 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 062f78e11..acda7adf8 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -4,12 +4,12 @@ from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.test import TestCase 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):