trivial: reapply black and isort

diff --git a/panikdb/aa/models.py b/panikdb/aa/models.py
index 4de4315133a8487973c354542d6b411837690853..d405afea767614abb6669964a839dbaf6cb332cf 100644 (file)
--- a/panikdb/aa/models.py
+++ b/panikdb/aa/models.py
@@ -4,7 +4,6 @@ from django.contrib.auth.models import AbstractUser
 from django.core import validators
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-
 from emissions.models import Emission, Episode, NewsCategory, NewsItem, SoundFile
 
 

diff --git a/panikdb/customtags/templatetags/panikdbtags.py b/panikdb/customtags/templatetags/panikdbtags.py
index 6e3d05020c562e4ac93722af8304cbcbf38f9427..3762848797b63a8493bb65ef575ef72786d6a1a5 100644 (file)
--- a/panikdb/customtags/templatetags/panikdbtags.py
+++ b/panikdb/customtags/templatetags/panikdbtags.py
@@ -1,12 +1,12 @@
 import datetime
 
+from combo.data.models import Page
 from django.conf import settings
 from django.db.models import Sum
 from django.template import Library
 from django.urls import reverse
-
-from combo.data.models import Page
 from emissions.models import Emission, Episode, Focus, NewsItem, SoundFile
+
 from panikdb.stats.models import DailyStat
 
 register = Library()

diff --git a/panikdb/oauth/views.py b/panikdb/oauth/views.py
index 2d9d22cadd15d501aefcf08c4340ffe913441cbe..4a2394f1e8694faa2ededda8c3032c926d998560 100644 (file)
--- a/panikdb/oauth/views.py
+++ b/panikdb/oauth/views.py
@@ -90,7 +90,7 @@ def user_info(request, *args, **kwargs):
     user_info = {
         # use a random string as id, as it is required for pharum not to pick
         # an existing and wrong user.
-        'id': str(random.randint(10 ** 6, 10 ** 7)),
+        'id': str(random.randint(10**6, 10**7)),
         'email': access_token.user.email,
         'name': str(access_token.user),
         'username': slugify(str(access_token.user)),

diff --git a/panikdb/regie/views.py b/panikdb/regie/views.py
index 759c07ce504eac9d27a7dc3a38c579be15df1671..b8eaf4fa4f96b0c0e393e36f289d05f0dab60036 100644 (file)
--- a/panikdb/regie/views.py
+++ b/panikdb/regie/views.py
@@ -15,9 +15,9 @@ from django.http import HttpResponseForbidden, HttpResponseNotAllowed, HttpRespo
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic.base import TemplateView
+from emissions.models import Nonstop
 from nonstop.models import SomaLogLine, Track
 
-from emissions.models import Nonstop
 from panikdb.context_processors import internal_ip
 from panikdb.service_messages.models import Message
 

diff --git a/panikdb/stats/models.py b/panikdb/stats/models.py
index 39a9e57f38d69cb7d459af80a45bf9a8fc7be3dc..4b3ddeca01c6d9ed2c5717e8d24e019d8d8fc8d3 100644 (file)
--- a/panikdb/stats/models.py
+++ b/panikdb/stats/models.py
@@ -1,5 +1,4 @@
 from django.db import models
-
 from emissions.models import SoundFile
 
 

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 267fa8a2bbd2e5a6002f61185444215b53d35eaa..36bd3082f3e15f760155ae52f4047b0af262607e 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -1,6 +1,9 @@
+import combo.public.views
 from agendas.urls import urlpatterns as agendas_urlpatterns
 from ckeditor.views import browse as ckeditor_browse
 from ckeditor.views import upload as ckeditor_upload
+from combo.manager.urls import urlpatterns as combo_manager_urls
+from combo.public.views import snapshot as combo_snapshot_view
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin
@@ -8,22 +11,18 @@ from django.contrib.auth import views as auth_views
 from django.contrib.auth.decorators import login_required
 from django.urls import reverse_lazy
 from django.views.generic import RedirectView
-from haystack.forms import FacetedSearchForm
-from haystack.query import SearchQuerySet
-from haystack.views import search_view_factory
-from nonstop.urls import public_urlpatterns as nonstop_public_urlpatterns
-from nonstop.urls import urlpatterns as nonstop_urlpatterns
-from wiki.urls import urlpatterns as wiki_urlpatterns
-
-import combo.public.views
-from combo.manager.urls import urlpatterns as combo_manager_urls
-from combo.public.views import snapshot as combo_snapshot_view
 from emissions.models import Emission, Episode, NewsItem
 from emissions.urls import urlpatterns as emissions_urlpatterns
 from emissions.views import FacetedSearchView
+from haystack.forms import FacetedSearchForm
+from haystack.query import SearchQuerySet
+from haystack.views import search_view_factory
 from matos.urls import urlpatterns as matos_urlpatterns
 from newsletter.urls import management_patterns as newsletter_urlpatterns
+from nonstop.urls import public_urlpatterns as nonstop_public_urlpatterns
+from nonstop.urls import urlpatterns as nonstop_urlpatterns
 from panikombo.urls import urlpatterns as panikombo_urlpatterns
+from wiki.urls import urlpatterns as wiki_urlpatterns
 
 from . import views
 from .aa.urls import urlpatterns as aa_urlpatterns

diff --git a/panikdb/views.py b/panikdb/views.py
index 82d89033b4625932e8fbbab682cf14981070e9b5..eb2ed8f8cd702fed3011b5db89363ecad069ca3a 100644 (file)
--- a/panikdb/views.py
+++ b/panikdb/views.py
@@ -1,6 +1,9 @@
 import datetime
 import logging
 
+import emissions.views
+import newsletter.views
+from combo.data.models import Page
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
@@ -9,10 +12,6 @@ from django.template import loader
 from django.urls import reverse
 from django.views.generic.base import RedirectView, TemplateView
 from django.views.generic.list import ListView
-
-import emissions.views
-import newsletter.views
-from combo.data.models import Page
 from emissions.models import Diffusion, Emission, Episode, Focus, NewsCategory, NewsItem, SoundFile
 from emissions.utils import period_program