Run "ruff check --fix", import sorting

JelteF · JelteF · commit 669e5bd61c8f · 2024-12-21T17:42:15.000+01:00
diff --git a/pgcommitfest/auth.py b/pgcommitfest/auth.py
@@ -24,27 +24,27 @@
 #   directory that's processed before the default django.contrib.admin)
 #
 
-from django.http import HttpResponse, HttpResponseRedirect
-from django.views.decorators.csrf import csrf_exempt
-from django.contrib.auth.models import User
-from django.contrib.auth.backends import ModelBackend
+from django.conf import settings
 from django.contrib.auth import login as django_login
 from django.contrib.auth import logout as django_logout
-from django.dispatch import Signal
+from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth.models import User
 from django.db import transaction
-from django.conf import settings
+from django.dispatch import Signal
+from django.http import HttpResponse, HttpResponseRedirect
+from django.views.decorators.csrf import csrf_exempt
 
 import base64
+import hmac
 import json
 import socket
-import hmac
-from urllib.parse import urlencode, parse_qs
+import time
+from urllib.parse import parse_qs, urlencode
+
 import requests
+from Cryptodome import Random
 from Cryptodome.Cipher import AES
 from Cryptodome.Hash import SHA
-from Cryptodome import Random
-import time
-
 
 # This signal fires when a user is created based on data from upstream.
 auth_user_created_from_upstream = Signal()
diff --git a/pgcommitfest/commitfest/admin.py b/pgcommitfest/commitfest/admin.py
@@ -1,15 +1,15 @@
 from django.contrib import admin
 
 from .models import (
-    Committer,
     CommitFest,
+    Committer,
+    MailThread,
+    MailThreadAttachment,
     Patch,
     PatchHistory,
     PatchOnCommitFest,
     TargetVersion,
     Topic,
-    MailThread,
-    MailThreadAttachment,
 )
 
 
diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
@@ -1,18 +1,26 @@
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponse, Http404
 from django.conf import settings
-from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.db import transaction
+from django.http import Http404, HttpResponse
+from django.shortcuts import get_object_or_404
+from django.views.decorators.csrf import csrf_exempt
 
-import requests
 import json
 import textwrap
 
+import requests
+
 from pgcommitfest.auth import user_search
-from .models import CommitFest, Patch, MailThread, MailThreadAttachment
-from .models import MailThreadAnnotation, PatchHistory
+
+from .models import (
+    CommitFest,
+    MailThread,
+    MailThreadAnnotation,
+    MailThreadAttachment,
+    Patch,
+    PatchHistory,
+)
 
 
 class HttpResponseServiceUnavailable(HttpResponse):
diff --git a/pgcommitfest/commitfest/forms.py b/pgcommitfest/commitfest/forms.py
@@ -1,13 +1,13 @@
 from django import forms
+from django.contrib.auth.models import User
+from django.db.models import Q
 from django.forms import ValidationError
 from django.forms.widgets import HiddenInput
-from django.db.models import Q
-from django.contrib.auth.models import User
 from django.http import Http404
 
-from .models import Patch, MailThread, PatchOnCommitFest, TargetVersion
-from .widgets import ThreadPickWidget
 from .ajax import _archivesAPI
+from .models import MailThread, Patch, PatchOnCommitFest, TargetVersion
+from .widgets import ThreadPickWidget
 
 
 class CommitFestFilterForm(forms.Form):
diff --git a/pgcommitfest/commitfest/lookups.py b/pgcommitfest/commitfest/lookups.py
@@ -1,7 +1,7 @@
-from django.http import HttpResponse, Http404
-from django.db.models import Q
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
+from django.db.models import Q
+from django.http import Http404, HttpResponse
 
 import json
 
diff --git a/pgcommitfest/commitfest/management/commands/send_notifications.py b/pgcommitfest/commitfest/management/commands/send_notifications.py
@@ -1,11 +1,10 @@
+from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import transaction
-from django.conf import settings
-
 
 from pgcommitfest.commitfest.models import PendingNotification
-from pgcommitfest.userprofile.models import UserProfile
 from pgcommitfest.mailqueue.util import send_template_mail
+from pgcommitfest.userprofile.models import UserProfile
 
 
 class Command(BaseCommand):
diff --git a/pgcommitfest/commitfest/migrations/0001_initial.py b/pgcommitfest/commitfest/migrations/0001_initial.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
+
 import pgcommitfest.commitfest.util
 
 
diff --git a/pgcommitfest/commitfest/migrations/0002_notifications.py b/pgcommitfest/commitfest/migrations/0002_notifications.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/commitfest/migrations/0004_target_version.py b/pgcommitfest/commitfest/migrations/0004_target_version.py
@@ -2,8 +2,8 @@
 # Generated by Django 1.11.17 on 2019-02-06 19:43
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/commitfest/migrations/0006_cfbot_integration.py b/pgcommitfest/commitfest/migrations/0006_cfbot_integration.py
@@ -1,7 +1,7 @@
 # Generated by Django 4.2.17 on 2024-12-21 14:15
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py
@@ -1,12 +1,12 @@
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
 
 from datetime import datetime
 
-from .util import DiffableModel
-
 from pgcommitfest.userprofile.models import UserProfile
 
+from .util import DiffableModel
+
 
 # We have few enough of these, and it's really the only thing we
 # need to extend from the user model, so just create a separate
diff --git a/pgcommitfest/commitfest/reports.py b/pgcommitfest/commitfest/reports.py
@@ -1,7 +1,7 @@
-from django.shortcuts import render, get_object_or_404
-from django.http import Http404
 from django.contrib.auth.decorators import login_required
 from django.db import connection
+from django.http import Http404
+from django.shortcuts import get_object_or_404, render
 
 from .models import CommitFest
 
diff --git a/pgcommitfest/commitfest/templatetags/commitfest.py b/pgcommitfest/commitfest/templatetags/commitfest.py
@@ -1,5 +1,5 @@
-from django.template.defaultfilters import stringfilter
 from django import template
+from django.template.defaultfilters import stringfilter
 
 from pgcommitfest.commitfest.models import PatchOnCommitFest
 
diff --git a/pgcommitfest/commitfest/util.py b/pgcommitfest/commitfest/util.py
@@ -1,5 +1,5 @@
-from django.forms.models import model_to_dict
 import django.db.models.fields.related
+from django.forms.models import model_to_dict
 
 
 class DiffableModel(object):
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
@@ -1,38 +1,46 @@
-from django.shortcuts import render, get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect
-from django.http import Http404, HttpResponseForbidden
-from django.views.decorators.csrf import csrf_exempt
-from django.db import transaction, connection
-from django.db.models import Q
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
+from django.db import connection, transaction
+from django.db.models import Q
+from django.http import (
+    Http404,
+    HttpResponse,
+    HttpResponseForbidden,
+    HttpResponseRedirect,
+)
+from django.shortcuts import get_object_or_404, render
+from django.views.decorators.csrf import csrf_exempt
 
-from django.conf import settings
-
+import hmac
+import json
+import urllib
 from datetime import datetime
 from email.mime.text import MIMEText
 from email.utils import formatdate, make_msgid
-import json
-import hmac
-import urllib
 
 from pgcommitfest.mailqueue.util import send_mail, send_simple_mail
 from pgcommitfest.userprofile.util import UserWrapper
 
+from .ajax import _archivesAPI, doAttachThread, refresh_single_thread
+from .feeds import ActivityFeed
+from .forms import (
+    BulkEmailForm,
+    CommentForm,
+    CommitFestFilterForm,
+    NewPatchForm,
+    PatchForm,
+)
 from .models import (
+    CfbotBranch,
     CommitFest,
+    Committer,
+    MailThread,
     Patch,
-    PatchOnCommitFest,
     PatchHistory,
-    Committer,
-    CfbotBranch,
+    PatchOnCommitFest,
 )
-from .models import MailThread
-from .forms import PatchForm, NewPatchForm, CommentForm, CommitFestFilterForm
-from .forms import BulkEmailForm
-from .ajax import doAttachThread, refresh_single_thread, _archivesAPI
-from .feeds import ActivityFeed
 
 
 def home(request):
diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py
@@ -1,10 +1,10 @@
 from django.template.loader import get_template
 
-from email.mime.text import MIMEText
+from email import encoders
 from email.mime.multipart import MIMEMultipart
 from email.mime.nonmultipart import MIMENonMultipart
+from email.mime.text import MIMEText
 from email.utils import formatdate
-from email import encoders
 
 from .models import QueuedMail
 
diff --git a/pgcommitfest/urls.py b/pgcommitfest/urls.py
@@ -1,11 +1,11 @@
-from django.urls import re_path
 from django.contrib import admin
+from django.urls import re_path
 
-import pgcommitfest.commitfest.views as views
-import pgcommitfest.commitfest.reports as reports
+import pgcommitfest.auth
 import pgcommitfest.commitfest.ajax as ajax
 import pgcommitfest.commitfest.lookups as lookups
-import pgcommitfest.auth
+import pgcommitfest.commitfest.reports as reports
+import pgcommitfest.commitfest.views as views
 import pgcommitfest.userprofile.views
 
 # Uncomment the next two lines to enable the admin:
diff --git a/pgcommitfest/userprofile/forms.py b/pgcommitfest/userprofile/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 
-from .models import UserProfile, UserExtraEmail
+from .models import UserExtraEmail, UserProfile
 
 
 class UserProfileForm(forms.ModelForm):
diff --git a/pgcommitfest/userprofile/migrations/0001_initial.py b/pgcommitfest/userprofile/migrations/0001_initial.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/userprofile/migrations/0002_notifications.py b/pgcommitfest/userprofile/migrations/0002_notifications.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/userprofile/migrations/0003_emails_managed_upstream.py b/pgcommitfest/userprofile/migrations/0003_emails_managed_upstream.py
@@ -1,7 +1,7 @@
 # Generated by Django 2.2.11 on 2020-08-11 11:09
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/pgcommitfest/userprofile/models.py b/pgcommitfest/userprofile/models.py
@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
 
 
 class UserExtraEmail(models.Model):
diff --git a/pgcommitfest/userprofile/util.py b/pgcommitfest/userprofile/util.py
@@ -1,7 +1,7 @@
-from email.utils import formataddr
 from email.header import Header
+from email.utils import formataddr
 
-from .models import UserProfile, UserExtraEmail
+from .models import UserExtraEmail, UserProfile
 
 
 class UserWrapper(object):
diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py
@@ -1,11 +1,11 @@
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from django.db import transaction
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.db import transaction
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
 
-from .models import UserProfile
 from .forms import UserProfileForm
+from .models import UserProfile
 
 
 @login_required
diff --git a/pgcommitfest/wsgi.py b/pgcommitfest/wsgi.py
@@ -7,10 +7,10 @@
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
 
-import os
-
 from django.core.wsgi import get_wsgi_application
 
+import os
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
 
 application = get_wsgi_application()
diff --git a/run_dev.py b/run_dev.py
diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py
diff --git a/tools/commitfest/update_archive_threads.py b/tools/commitfest/update_archive_threads.py
diff --git a/tools/mail/send_queued_mail.py b/tools/mail/send_queued_mail.py
