Correct sorting of import statements.

This commit is contained in:
Tom Christie 2016-06-01 13:20:45 +01:00
parent 437a125793
commit c65c5e4b2c
17 changed files with 26 additions and 26 deletions

View File

@ -1,7 +1,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.contrib.auth.models import User 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 from rest_framework.test import APIClient

View File

@ -7,13 +7,13 @@ from django.db import connection, connections, transaction
from django.http import Http404 from django.http import Http404
from django.test import TestCase, TransactionTestCase from django.test import TestCase, TransactionTestCase
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from tests.models import BasicModel
from rest_framework import status from rest_framework import status
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
from rest_framework.views import APIView from rest_framework.views import APIView
from tests.models import BasicModel
factory = APIRequestFactory() factory = APIRequestFactory()

View File

@ -8,7 +8,7 @@ from django.conf.urls import include, url
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models from django.db import models
from django.http import HttpResponse 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 django.utils import six
from rest_framework import ( from rest_framework import (

View File

@ -5,13 +5,13 @@ from django.db import models
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.test import TestCase from django.test import TestCase
from django.utils import six from django.utils import six
from tests.models import (
BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel
)
from rest_framework import generics, renderers, serializers, status from rest_framework import generics, renderers, serializers, status
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
from tests.models import (
BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel
)
factory = APIRequestFactory() factory = APIRequestFactory()

View File

@ -5,7 +5,7 @@ from django.conf.urls import url
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.http import Http404 from django.http import Http404
from django.template import Template, TemplateDoesNotExist 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 django.utils import six
from rest_framework import status from rest_framework import status

View File

@ -2,9 +2,9 @@ from __future__ import unicode_literals
from django.db import models from django.db import models
from django.test import TestCase from django.test import TestCase
from tests.models import RESTFrameworkModel
from rest_framework import serializers from rest_framework import serializers
from tests.models import RESTFrameworkModel
# Models # Models

View File

@ -7,6 +7,7 @@ from django.contrib.auth.models import Group, Permission, User
from django.core.urlresolvers import ResolverMatch from django.core.urlresolvers import ResolverMatch
from django.db import models from django.db import models
from django.test import TestCase from django.test import TestCase
from tests.models import BasicModel
from rest_framework import ( from rest_framework import (
HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers, 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.filters import DjangoObjectPermissionsFilter
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
from tests.models import BasicModel
factory = APIRequestFactory() factory = APIRequestFactory()

View File

@ -1,15 +1,15 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import url from django.conf.urls import url
from django.test import override_settings, TestCase from django.test import TestCase, override_settings
from rest_framework import serializers
from rest_framework.test import APIRequestFactory
from tests.models import ( from tests.models import (
ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget,
NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget
) )
from rest_framework import serializers
from rest_framework.test import APIRequestFactory
factory = APIRequestFactory() factory = APIRequestFactory()
request = factory.get('/') # Just to ensure we have a request in the serializer context request = factory.get('/') # Just to ensure we have a request in the serializer context

View File

@ -2,14 +2,14 @@ from __future__ import unicode_literals
from django.test import TestCase from django.test import TestCase
from django.utils import six from django.utils import six
from rest_framework import serializers
from tests.models import ( from tests.models import (
ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget,
NullableForeignKeySource, NullableOneToOneSource, NullableForeignKeySource, NullableOneToOneSource,
NullableUUIDForeignKeySource, OneToOneTarget, UUIDForeignKeyTarget NullableUUIDForeignKeySource, OneToOneTarget, UUIDForeignKeyTarget
) )
from rest_framework import serializers
# ManyToMany # ManyToMany
class ManyToManyTargetSerializer(serializers.ModelSerializer): class ManyToManyTargetSerializer(serializers.ModelSerializer):

View File

@ -1,10 +1,10 @@
from django.test import TestCase from django.test import TestCase
from rest_framework import serializers
from tests.models import ( from tests.models import (
ForeignKeySource, ForeignKeyTarget, NullableForeignKeySource ForeignKeySource, ForeignKeyTarget, NullableForeignKeySource
) )
from rest_framework import serializers
class ForeignKeyTargetSerializer(serializers.ModelSerializer): class ForeignKeyTargetSerializer(serializers.ModelSerializer):
sources = serializers.SlugRelatedField( sources = serializers.SlugRelatedField(

View File

@ -8,7 +8,7 @@ from collections import MutableMapping, OrderedDict
from django.conf.urls import include, url from django.conf.urls import include, url
from django.core.cache import cache from django.core.cache import cache
from django.db import models 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 import six
from django.utils.safestring import SafeText from django.utils.safestring import SafeText
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _

View File

@ -7,7 +7,7 @@ from django.conf.urls import url
from django.contrib.auth import authenticate, login, logout from django.contrib.auth import authenticate, login, logout
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.sessions.middleware import SessionMiddleware 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 django.utils import six
from rest_framework import status from rest_framework import status

View File

@ -1,8 +1,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import include, url 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 django.utils import six
from tests.models import BasicModel
from rest_framework import generics, routers, serializers, status, viewsets from rest_framework import generics, routers, serializers, status, viewsets
from rest_framework.parsers import JSONParser from rest_framework.parsers import JSONParser
@ -11,7 +12,6 @@ from rest_framework.renderers import (
) )
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from tests.models import BasicModel
# Serializer used to test BasicModel # Serializer used to test BasicModel

View File

@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.conf.urls import url from django.conf.urls import url
from django.core.urlresolvers import NoReverseMatch 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.reverse import reverse
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory

View File

@ -5,7 +5,7 @@ from collections import namedtuple
from django.conf.urls import include, url from django.conf.urls import include, url
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db import models 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 import permissions, serializers, viewsets
from rest_framework.decorators import detail_route, list_route from rest_framework.decorators import detail_route, list_route

View File

@ -6,7 +6,7 @@ from io import BytesIO
from django.conf.urls import url from django.conf.urls import url
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.shortcuts import redirect 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.decorators import api_view
from rest_framework.response import Response from rest_framework.response import Response

View File

@ -2,14 +2,14 @@ from __future__ import unicode_literals
from django.conf.urls import url from django.conf.urls import url
from django.core.exceptions import ImproperlyConfigured 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 django.utils import six
from tests.models import BasicModel
import rest_framework.utils.model_meta import rest_framework.utils.model_meta
from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.utils.breadcrumbs import get_breadcrumbs
from rest_framework.utils.model_meta import _resolve_model from rest_framework.utils.model_meta import _resolve_model
from rest_framework.views import APIView from rest_framework.views import APIView
from tests.models import BasicModel
class Root(APIView): class Root(APIView):