From 5facf792fff4987c3b829ee24f404ae70f5212fb Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Sat, 21 Dec 2024 17:15:56 +0100 Subject: [PATCH] Run "ruff check --fix" for import sorting --- pgcommitfest/auth.py | 29 +++++----- pgcommitfest/commitfest/admin.py | 6 +-- pgcommitfest/commitfest/ajax.py | 25 +++++---- pgcommitfest/commitfest/forms.py | 8 +-- pgcommitfest/commitfest/lookups.py | 8 +-- .../management/commands/send_notifications.py | 5 +- .../commitfest/migrations/0001_initial.py | 3 +- .../migrations/0002_notifications.py | 2 +- .../migrations/0004_target_version.py | 2 +- .../migrations/0006_cfbot_integration.py | 2 +- pgcommitfest/commitfest/models.py | 8 +-- pgcommitfest/commitfest/reports.py | 4 +- .../commitfest/templatetags/commitfest.py | 2 +- pgcommitfest/commitfest/util.py | 2 +- pgcommitfest/commitfest/views.py | 54 +++++++++++-------- pgcommitfest/mailqueue/util.py | 8 +-- pgcommitfest/urls.py | 8 +-- pgcommitfest/userprofile/forms.py | 2 +- .../userprofile/migrations/0001_initial.py | 2 +- .../migrations/0002_notifications.py | 2 +- .../0003_emails_managed_upstream.py | 2 +- pgcommitfest/userprofile/models.py | 2 +- pgcommitfest/userprofile/util.py | 4 +- pgcommitfest/userprofile/views.py | 8 +-- run_dev.py | 2 +- tools/commitfest/check_patches_in_archives.py | 7 +-- tools/commitfest/update_archive_threads.py | 4 +- tools/mail/send_queued_mail.py | 2 +- 28 files changed, 114 insertions(+), 99 deletions(-) diff --git a/pgcommitfest/auth.py b/pgcommitfest/auth.py index 7f4bb1e6..575656ba 100644 --- a/pgcommitfest/auth.py +++ b/pgcommitfest/auth.py @@ -24,27 +24,26 @@ # 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.contrib.auth import login as django_login -from django.contrib.auth import logout as django_logout -from django.dispatch import Signal -from django.db import transaction -from django.conf import settings - 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 - +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.contrib.auth.backends import ModelBackend +from django.contrib.auth.models import User +from django.db import transaction +from django.dispatch import Signal +from django.http import HttpResponse, HttpResponseRedirect +from django.views.decorators.csrf import csrf_exempt # 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 index 5606ea2d..dbe8a0bc 100644 --- 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 index 58e1e46c..71b1abdf 100644 --- a/pgcommitfest/commitfest/ajax.py +++ b/pgcommitfest/commitfest/ajax.py @@ -1,18 +1,25 @@ -from django.shortcuts import get_object_or_404 -from django.http import HttpResponse, Http404 +import json +import textwrap + +import requests 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 - -import requests -import json -import textwrap +from django.http import Http404, HttpResponse +from django.shortcuts import get_object_or_404 +from django.views.decorators.csrf import csrf_exempt 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 index a3ce2143..5adc0ec7 100644 --- 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 index b551c801..296473ea 100644 --- a/pgcommitfest/commitfest/lookups.py +++ b/pgcommitfest/commitfest/lookups.py @@ -1,9 +1,9 @@ -from django.http import HttpResponse, Http404 -from django.db.models import Q +import json + from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User - -import json +from django.db.models import Q +from django.http import Http404, HttpResponse @login_required diff --git a/pgcommitfest/commitfest/management/commands/send_notifications.py b/pgcommitfest/commitfest/management/commands/send_notifications.py index b5c3ce65..728c7f99 100644 --- 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 index eb03fa50..aa688d7e 100644 --- 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 index 54499352..450ddfbe 100644 --- 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 index 3394fe07..ad546109 100644 --- 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 index 5b13a4b1..6c0ea9f1 100644 --- a/pgcommitfest/commitfest/migrations/0006_cfbot_integration.py +++ b/pgcommitfest/commitfest/migrations/0006_cfbot_integration.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.25 on 2024-10-31 22:53 -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 index b029de15..ee77bef7 100644 --- 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 datetime import datetime -from .util import DiffableModel +from django.contrib.auth.models import User +from django.db import models 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 index 1c97e247..e4191e16 100644 --- 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 index b0a1768e..edcbd5b3 100644 --- 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 index f8b0c853..10f9c816 100644 --- 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 index 114c6ce8..bfc98d07 100644 --- 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.contrib import messages -from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User - -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 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 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 index 7e7300cb..a0cd73be 100644 --- 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 django.template.loader import get_template from .models import QueuedMail diff --git a/pgcommitfest/urls.py b/pgcommitfest/urls.py index 44a3c6c3..a3a0c021 100644 --- 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 index 36df1f30..e0ed5a1b 100644 --- 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 index 9ca4ffce..45ad7696 100644 --- 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 index 468c5e60..69eaf03a 100644 --- 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 index 9774a44f..622e6796 100644 --- 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 index 2707ac9f..f6294109 100644 --- 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 index 7d2bca0b..78a17597 100644 --- 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 index 38dade39..f33216bd 100644 --- 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/run_dev.py b/run_dev.py index 1d2c1783..543c4ebf 100755 --- a/run_dev.py +++ b/run_dev.py @@ -12,9 +12,9 @@ files and run uWSGI with the correct path. """ -from importlib.machinery import PathFinder import subprocess import sys +from importlib.machinery import PathFinder django_path = PathFinder().find_spec("django").submodule_search_locations[0] diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py index 36052ecc..e68150ce 100755 --- a/tools/commitfest/check_patches_in_archives.py +++ b/tools/commitfest/check_patches_in_archives.py @@ -7,11 +7,12 @@ # so we don't block the archives unnecessarily. # +import logging import os import sys -import requests + import magic -import logging +import requests # Set up for accessing django sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../")) @@ -20,8 +21,8 @@ django.setup() -from django.db import connection # noqa: E402 from django.conf import settings # noqa: E402 +from django.db import connection # noqa: E402 from pgcommitfest.commitfest.models import MailThreadAttachment # noqa: E402 diff --git a/tools/commitfest/update_archive_threads.py b/tools/commitfest/update_archive_threads.py index 22650ca4..b90348b5 100755 --- a/tools/commitfest/update_archive_threads.py +++ b/tools/commitfest/update_archive_threads.py @@ -6,9 +6,9 @@ # at least not all of them all the time... # +import logging import os import sys -import logging # Set up for accessing django sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../")) @@ -19,8 +19,8 @@ from django.db import connection # noqa: E402 -from pgcommitfest.commitfest.models import MailThread # noqa: E402 from pgcommitfest.commitfest.ajax import refresh_single_thread # noqa: E402 +from pgcommitfest.commitfest.models import MailThread # noqa: E402 if __name__ == "__main__": debug = "--debug" in sys.argv diff --git a/tools/mail/send_queued_mail.py b/tools/mail/send_queued_mail.py index 5d994122..21b31ded 100755 --- a/tools/mail/send_queued_mail.py +++ b/tools/mail/send_queued_mail.py @@ -8,9 +8,9 @@ # by one. # -import sys import os import smtplib +import sys # Set up to run in django environment sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../"))