Apply isort + black stable

Black stable is only exponentiation spacing change

froide/accesstoken/apps.py

@@ -27,6 +27,7 @@ def cancel_user(sender, user=None, **kwargs):
 
 def merge_user(sender, old_user=None, new_user=None, **kwargs):
     from froide.account.utils import move_ownership
+
     from .models import AccessToken
 
     move_ownership(AccessToken, "user", old_user, new_user, dupe=("user", "purpose"))

froide/accesstoken/forms.py

@@ -4,8 +4,8 @@
 from django.utils.translation import gettext_lazy as _
 
 from .models import AccessToken
-from .widgets import TokenWidget
 from .utils import get_signed_purpose, unsign_purpose
+from .widgets import TokenWidget
 
 
 def clean_purpose(field):

froide/accesstoken/migrations/0001_initial.py

@@ -2,10 +2,11 @@
 # Generated by Django 1.11.15 on 2018-11-09 15:29
 from __future__ import unicode_literals
 
+import uuid
+
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
-import uuid
 
 
 class Migration(migrations.Migration):

froide/accesstoken/migrations/0002_accesstoken_timestamp.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.1.4 on 2019-01-18 13:46
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/accesstoken/models.py

@@ -1,9 +1,9 @@
 import uuid
 
-from django.db import models
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _
+from django.db import models
 from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
 
 class AccessTokenManager(models.Manager):

froide/accesstoken/urls.py

@@ -2,7 +2,6 @@
 
 from .views import reset_token
 
-
 urlpatterns = [
     path("reset/", reset_token, name="accesstoken-reset"),
 ]

froide/accesstoken/utils.py

@@ -1,4 +1,4 @@
-from django.core.signing import Signer, BadSignature
+from django.core.signing import BadSignature, Signer
 from django.shortcuts import Http404
 
 from .models import AccessToken

froide/accesstoken/views.py

@@ -1,8 +1,8 @@
-from django.views.decorators.http import require_POST
-from django.utils.translation import gettext_lazy as _
 from django.contrib import messages
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.http import require_POST
 
-from froide.helper.utils import render_403, get_redirect
+from froide.helper.utils import get_redirect, render_403
 
 from .forms import ResetTokenForm
 

froide/account/admin.py

@@ -1,25 +1,25 @@
-from django.db.models import Count
-from django.core.exceptions import PermissionDenied
-from django.urls import path
-from django.template.response import TemplateResponse
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
-from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin
 from django.contrib.admin import helpers
+from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin
+from django.core.exceptions import PermissionDenied
+from django.db.models import Count
 from django.shortcuts import redirect
+from django.template.response import TemplateResponse
+from django.urls import path
+from django.utils.translation import gettext_lazy as _
 
 from froide.foirequest.models import FoiRequest
+from froide.helper.admin_utils import MultiFilterMixin, TaggitListFilter
 from froide.helper.csv_utils import export_csv_response
-from froide.helper.admin_utils import TaggitListFilter, MultiFilterMixin
 
 from . import account_email_changed
-from .models import User, TaggedUser, UserTag, AccountBlocklist, UserPreference
-from .services import AccountService
-from .tasks import start_export_task, send_bulk_mail, merge_accounts_task
 from .forms import UserChangeForm, UserCreationForm
+from .models import AccountBlocklist, TaggedUser, User, UserPreference, UserTag
+from .services import AccountService
+from .tasks import merge_accounts_task, send_bulk_mail, start_export_task
 from .utils import (
-    delete_all_unexpired_sessions_for_user,
     cancel_user,
+    delete_all_unexpired_sessions_for_user,
     make_account_private,
 )
 

froide/account/api_views.py

@@ -1,10 +1,8 @@
-from rest_framework import serializers, views, response
+from oauth2_provider.contrib.rest_framework import IsAuthenticatedOrTokenHasScope
+from rest_framework import response, serializers, status, views
 from rest_framework.permissions import IsAuthenticated
-from rest_framework import status
 from rest_framework.response import Response
 
-from oauth2_provider.contrib.rest_framework import IsAuthenticatedOrTokenHasScope
-
 from .models import User, UserPreference
 from .preferences import registry
 

froide/account/apps.py

@@ -1,8 +1,8 @@
 from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
-from .menu import menu_registry, MenuItem
+from .menu import MenuItem, menu_registry
 
 
 class AccountConfig(AppConfig):

froide/account/export.py

@@ -1,22 +1,23 @@
-from datetime import timedelta
 import json
 import os
 import tempfile
 import zipfile
+from datetime import timedelta
 
-from django.core.files.storage import default_storage
-from django.utils.translation import override, gettext_lazy as _
 from django.conf import settings
-from django.utils import timezone
+from django.core.files.storage import default_storage
 from django.template.loader import render_to_string
 from django.urls import reverse
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import override
 
 from crossdomainmedia import CrossDomainMediaAuth
 
 from froide.helper.csv_utils import get_dict
 
-from .utils import send_mail_user
 from .tasks import start_export_task
+from .utils import send_mail_user
 
 PURPOSE = "dataexport"
 EXPORT_MEDIA_PREFIX = "export"

froide/account/forms.py

@@ -1,28 +1,25 @@
 from collections import defaultdict
 
-from django.utils.translation import gettext_lazy as _
-from django.utils.html import format_html
+from django import forms
+from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth import get_user_model
-from django.conf import settings
 from django.contrib.auth.forms import SetPasswordForm as DjangoSetPasswordForm
+from django.contrib.auth.forms import UserChangeForm as DjangoUserChangeForm
+from django.contrib.auth.forms import UserCreationForm as DjangoUserCreationForm
 from django.contrib.auth.password_validation import password_validators_help_text_html
-from django.contrib.auth.forms import (
-    UserCreationForm as DjangoUserCreationForm,
-    UserChangeForm as DjangoUserChangeForm,
-)
-from django import forms
+from django.utils.html import format_html
+from django.utils.translation import gettext_lazy as _
 
-from froide.helper.spam import SpamProtectionMixin
-from froide.helper.form_utils import JSONMixin
 from froide.helper.content_urls import get_content_url
+from froide.helper.form_utils import JSONMixin
+from froide.helper.spam import SpamProtectionMixin
 from froide.helper.widgets import BootstrapCheckboxInput
 
 from . import account_email_changed
-from .widgets import ConfirmationWidget
 from .models import AccountBlocklist, User
 from .services import AccountService, get_user_for_email
-
+from .widgets import ConfirmationWidget
 
 USER_CAN_HIDE_WEB = settings.FROIDE_CONFIG.get("user_can_hide_web", True)
 ALLOW_PSEUDONYM = settings.FROIDE_CONFIG.get("allow_pseudonym", False)

froide/account/hashers.py

@@ -2,10 +2,7 @@
 From: https://docs.djangoproject.com/en/1.11/topics/auth/passwords/#password-upgrading-without-requiring-a-login
 """
 
-from django.contrib.auth.hashers import (
-    PBKDF2PasswordHasher,
-    SHA1PasswordHasher,
-)
+from django.contrib.auth.hashers import PBKDF2PasswordHasher, SHA1PasswordHasher
 
 
 class PBKDF2WrappedSHA1PasswordHasher(PBKDF2PasswordHasher):

froide/account/management/commands/send_mass_mail.py

@@ -1,6 +1,6 @@
+from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.utils import translation
-from django.conf import settings
 
 from froide.account.models import User
 

froide/account/menu.py

@@ -1,4 +1,4 @@
-from collections import namedtuple, defaultdict
+from collections import defaultdict, namedtuple
 
 MenuItem = namedtuple("MenuItem", "section order label url")
 

froide/account/middleware.py

@@ -1,6 +1,6 @@
-from django.core.exceptions import ImproperlyConfigured
 from django.contrib.auth.views import redirect_to_login
 from django.contrib.flatpages.views import flatpage
+from django.core.exceptions import ImproperlyConfigured
 
 from .views import new_terms
 

froide/account/migrations/0001_initial.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-import django.utils.timezone
-import django.core.validators
 import django.contrib.auth.models
+import django.core.validators
+import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0002_auto_20150729_0828.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0003_auto_20160125_2127.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0004_user_is_trusted.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0005_user_is_blocked.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0012_application.py

@@ -2,9 +2,10 @@
 # Generated by Django 1.11.6 on 2017-11-10 14:28
 from __future__ import unicode_literals
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
+
 import oauth2_provider.generators
 import oauth2_provider.validators
 

froide/account/migrations/0013_auto_20180417_1113.py

@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import froide.account.models
 import froide.helper.storage
 

froide/account/migrations/0016_auto_20190212_1101.py

@@ -1,8 +1,9 @@
 # Generated by Django 2.1.5 on 2019-02-12 10:01
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
+
 import taggit.managers
 
 

froide/account/migrations/0019_auto_20190309_1223.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.1.7 on 2019-03-09 11:23
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0021_auto_20190309_1226.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.1.7 on 2019-03-09 11:26
 
 from django.db import migrations
+
 import taggit.managers
 
 

froide/account/migrations/0022_accountblacklist.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.1.9 on 2019-08-16 14:54
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0023_auto_20200527_1240.py

@@ -1,8 +1,8 @@
 # Generated by Django 3.0.5 on 2020-05-27 10:40
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

froide/account/migrations/0032_auto_20211203_1058.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.2.8 on 2021-12-03 09:58
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

froide/account/models.py

@@ -2,23 +2,22 @@
 import os
 import re
 
-from django.db import models
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _
-from django.urls import reverse
-from django.utils import timezone
-from django.contrib.postgres.fields import CIEmailField
 from django.contrib.auth.models import (
     AbstractBaseUser,
-    PermissionsMixin,
     BaseUserManager,
+    PermissionsMixin,
 )
 from django.contrib.auth.validators import UnicodeUsernameValidator
-
-from taggit.managers import TaggableManager
-from taggit.models import TaggedItemBase, TagBase
+from django.contrib.postgres.fields import CIEmailField
+from django.db import models
+from django.urls import reverse
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
 from oauth2_provider.models import AbstractApplication
+from taggit.managers import TaggableManager
+from taggit.models import TagBase, TaggedItemBase
 
 from froide.helper.csv_utils import export_csv, get_dict
 from froide.helper.storage import HashedFilenameStorage