From ab80dffeeac5b39f70e8ce4e6a9706471889c22e Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 10 Jun 2018 11:29:24 +0200
Subject: [PATCH] See #297: sorted config imports
---
api/config/api_urls.py | 10 +++++-----
api/config/asgi.py | 7 ++++---
api/config/routing.py | 4 +---
api/config/settings/common.py | 7 +++----
api/config/settings/production.py | 1 -
api/config/urls.py | 2 +-
api/config/wsgi.py | 2 --
7 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/api/config/api_urls.py b/api/config/api_urls.py
index f3f61313..9e634b7c 100644
--- a/api/config/api_urls.py
+++ b/api/config/api_urls.py
@@ -1,15 +1,15 @@
+from django.conf.urls import include, url
+from dynamic_preferences.api.viewsets import GlobalPreferencesViewSet
+from dynamic_preferences.users.viewsets import UserPreferencesViewSet
from rest_framework import routers
from rest_framework.urlpatterns import format_suffix_patterns
-from django.conf.urls import include, url
+from rest_framework_jwt import views as jwt_views
+
from funkwhale_api.activity import views as activity_views
from funkwhale_api.instance import views as instance_views
from funkwhale_api.music import views
from funkwhale_api.playlists import views as playlists_views
from funkwhale_api.subsonic.views import SubsonicViewSet
-from rest_framework_jwt import views as jwt_views
-
-from dynamic_preferences.api.viewsets import GlobalPreferencesViewSet
-from dynamic_preferences.users.viewsets import UserPreferencesViewSet
router = routers.SimpleRouter()
router.register(r"settings", GlobalPreferencesViewSet, base_name="settings")
diff --git a/api/config/asgi.py b/api/config/asgi.py
index b976a02e..df741d25 100644
--- a/api/config/asgi.py
+++ b/api/config/asgi.py
@@ -1,8 +1,9 @@
-import django
import os
+import django
+
+from .routing import application
+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
django.setup()
-
-from .routing import application
diff --git a/api/config/routing.py b/api/config/routing.py
index b1f16375..07b5392d 100644
--- a/api/config/routing.py
+++ b/api/config/routing.py
@@ -1,12 +1,10 @@
-from django.conf.urls import url
-
from channels.auth import AuthMiddlewareStack
from channels.routing import ProtocolTypeRouter, URLRouter
+from django.conf.urls import url
from funkwhale_api.common.auth import TokenAuthMiddleware
from funkwhale_api.instance import consumers
-
application = ProtocolTypeRouter(
{
# Empty for now (http->django views is added by default)
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index f7688a4e..c39ca8ca 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -10,8 +10,10 @@ https://docs.djangoproject.com/en/dev/ref/settings/
"""
from __future__ import absolute_import, unicode_literals
-from urllib.parse import urlsplit
+import datetime
import os
+from urllib.parse import urlparse, urlsplit
+
import environ
from celery.schedules import crontab
@@ -315,7 +317,6 @@ CACHE_DEFAULT = "redis://127.0.0.1:6379/0"
CACHES = {"default": env.cache_url("CACHE_URL", default=CACHE_DEFAULT)}
CACHES["default"]["BACKEND"] = "django_redis.cache.RedisCache"
-from urllib.parse import urlparse
cache_url = urlparse(CACHES["default"]["LOCATION"])
CHANNEL_LAYERS = {
@@ -351,8 +352,6 @@ CELERYBEAT_SCHEDULE = {
}
}
-import datetime
-
JWT_AUTH = {
"JWT_ALLOW_REFRESH": True,
"JWT_EXPIRATION_DELTA": datetime.timedelta(days=7),
diff --git a/api/config/settings/production.py b/api/config/settings/production.py
index 0c79ee2e..b81eb8ad 100644
--- a/api/config/settings/production.py
+++ b/api/config/settings/production.py
@@ -13,7 +13,6 @@ from __future__ import absolute_import, unicode_literals
from django.utils import six
-
from .common import * # noqa
# SECRET CONFIGURATION
diff --git a/api/config/urls.py b/api/config/urls.py
index 60753294..eb3f66ca 100644
--- a/api/config/urls.py
+++ b/api/config/urls.py
@@ -5,8 +5,8 @@ from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.contrib import admin
-from django.views.generic import TemplateView
from django.views import defaults as default_views
+from django.views.generic import TemplateView
urlpatterns = [
# Django Admin, use {% url 'admin:index' %}
diff --git a/api/config/wsgi.py b/api/config/wsgi.py
index a53b580d..8e843eb4 100644
--- a/api/config/wsgi.py
+++ b/api/config/wsgi.py
@@ -15,11 +15,9 @@ framework.
"""
import os
-
from django.core.wsgi import get_wsgi_application
from whitenoise.django import DjangoWhiteNoise
-
# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
# if running multiple sites in the same mod_wsgi process. To fix this, use
# mod_wsgi daemon mode with each site in its own daemon process, or use
--
GitLab