See #297: sorted imports

This commit is contained in:
Eliot Berriot 2018-06-10 10:55:16 +02:00
commit 9bea804f14
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
132 changed files with 218 additions and 363 deletions

View file

@ -1,6 +1,5 @@
from django.conf import settings
from allauth.account.adapter import DefaultAccountAdapter
from django.conf import settings
from dynamic_preferences.registries import global_preferences_registry

View file

@ -1,4 +1,5 @@
from rest_framework import routers
from . import views
router = routers.SimpleRouter()

View file

@ -1,8 +1,8 @@
import factory
from funkwhale_api.factories import registry, ManyToManyFromList
from django.contrib.auth.models import Permission
from funkwhale_api.factories import ManyToManyFromList, registry
@registry.register
class GroupFactory(factory.django.DjangoModelFactory):

View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import
from __future__ import absolute_import, unicode_literals
import binascii
import os
@ -7,13 +7,12 @@ import uuid
from django.conf import settings
from django.contrib.auth.models import AbstractUser
from django.urls import reverse
from django.db import models
from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from funkwhale_api.common import fields
from funkwhale_api.common import preferences
from funkwhale_api.common import fields, preferences
def get_token():

View file

@ -1,12 +1,10 @@
from django.views.generic import TemplateView
from django.conf.urls import url
from rest_auth.registration import views as registration_views
from django.views.generic import TemplateView
from rest_auth import views as rest_auth_views
from rest_auth.registration import views as registration_views
from . import views
urlpatterns = [
url(r"^$", views.RegisterView.as_view(), name="rest_register"),
url(

View file

@ -1,7 +1,7 @@
from django.conf import settings
from rest_framework import serializers
from rest_auth.serializers import PasswordResetSerializer as PRS
from rest_framework import serializers
from funkwhale_api.activity import serializers as activity_serializers
from . import models

View file

@ -1,15 +1,12 @@
from rest_framework.response import Response
from rest_framework import mixins
from rest_framework import viewsets
from rest_framework.decorators import detail_route, list_route
from rest_auth.registration.views import RegisterView as BaseRegisterView
from allauth.account.adapter import get_adapter
from rest_auth.registration.views import RegisterView as BaseRegisterView
from rest_framework import mixins, viewsets
from rest_framework.decorators import detail_route, list_route
from rest_framework.response import Response
from funkwhale_api.common import preferences
from . import models
from . import serializers
from . import models, serializers
class RegisterView(BaseRegisterView):