' +
+ $dropdown.append('
' +
'⬇ Scroll to see all ' + totalOptions + ' tags, or type to search' +
'
');
}
diff --git a/pgcommitfest/commitfest/templatetags/commitfest.py b/pgcommitfest/commitfest/templatetags/commitfest.py
index 5c6d22e9..58a22bfe 100644
--- a/pgcommitfest/commitfest/templatetags/commitfest.py
+++ b/pgcommitfest/commitfest/templatetags/commitfest.py
@@ -18,28 +18,28 @@
@stringfilter
def commitfeststatusstring(value):
i = int(value)
- return [v for k, v in CommitFest._STATUS_CHOICES if k == i][0]
+ return next(v for k, v in CommitFest._STATUS_CHOICES if k == i)
@register.filter(name="commitfeststatuslabel")
@stringfilter
def commitfeststatuslabel(value):
i = int(value)
- return [v for k, v in CommitFest._STATUS_LABELS if k == i][0]
+ return next(v for k, v in CommitFest._STATUS_LABELS if k == i)
@register.filter(name="patchstatusstring")
@stringfilter
def patchstatusstring(value):
i = int(value)
- return [v for k, v in PatchOnCommitFest._STATUS_CHOICES if k == i][0]
+ return next(v for k, v in PatchOnCommitFest._STATUS_CHOICES if k == i)
@register.filter(name="patchstatuslabel")
@stringfilter
def patchstatuslabel(value):
i = int(value)
- return [v for k, v in PatchOnCommitFest._STATUS_LABELS if k == i][0]
+ return next(v for k, v in PatchOnCommitFest._STATUS_LABELS if k == i)
@register.filter(name="tagname")
diff --git a/pgcommitfest/commitfest/tests/test_apiv1.py b/pgcommitfest/commitfest/tests/test_apiv1.py
index 539f29e1..5184618b 100644
--- a/pgcommitfest/commitfest/tests/test_apiv1.py
+++ b/pgcommitfest/commitfest/tests/test_apiv1.py
@@ -2,7 +2,7 @@
from django.test.utils import CaptureQueriesContext
import json
-from datetime import datetime, timezone
+from datetime import UTC, datetime
import pytest
@@ -129,7 +129,7 @@ def test_commitfest_patches_endpoint(client, open_cf, alice, bob):
# Create test patches
patch1 = Patch.objects.create(name="Add feature X")
patch1.authors.add(alice)
- patch1.lastmail = datetime(2025, 1, 15, 10, 30, 0, tzinfo=timezone.utc)
+ patch1.lastmail = datetime(2025, 1, 15, 10, 30, 0, tzinfo=UTC)
patch1.save()
patch2 = Patch.objects.create(name="Fix bug Y")
@@ -140,24 +140,24 @@ def test_commitfest_patches_endpoint(client, open_cf, alice, bob):
PatchOnCommitFest.objects.create(
patch=patch1,
commitfest=open_cf,
- enterdate=datetime(2025, 1, 1, 12, 0, 0, tzinfo=timezone.utc),
+ enterdate=datetime(2025, 1, 1, 12, 0, 0, tzinfo=UTC),
status=PatchOnCommitFest.STATUS_REVIEW,
)
PatchOnCommitFest.objects.create(
patch=patch2,
commitfest=open_cf,
- enterdate=datetime(2025, 1, 2, 8, 0, 0, tzinfo=timezone.utc),
+ enterdate=datetime(2025, 1, 2, 8, 0, 0, tzinfo=UTC),
# leavedate is only allowed on statuses that close the patch out
- leavedate=datetime(2025, 1, 20, 16, 45, 0, tzinfo=timezone.utc),
+ leavedate=datetime(2025, 1, 20, 16, 45, 0, tzinfo=UTC),
status=PatchOnCommitFest.STATUS_COMMITTED,
)
thread = MailThread.objects.create(
messageid="abc123@example.com",
subject="[PATCH] Add feature X",
- firstmessage=datetime(2025, 1, 10, 9, 0, 0, tzinfo=timezone.utc),
+ firstmessage=datetime(2025, 1, 10, 9, 0, 0, tzinfo=UTC),
firstauthor="alice@example.com",
- latestmessage=datetime(2025, 1, 12, 14, 30, 0, tzinfo=timezone.utc),
+ latestmessage=datetime(2025, 1, 12, 14, 30, 0, tzinfo=UTC),
latestauthor="bob@example.com",
latestsubject="Re: [PATCH] Add feature X",
latestmsgid="def456@example.com",
@@ -168,7 +168,7 @@ def test_commitfest_patches_endpoint(client, open_cf, alice, bob):
messageid="abc123@example.com",
attachmentid=1,
filename="v1.patch",
- date=datetime(2025, 1, 10, 9, 0, 0, tzinfo=timezone.utc),
+ date=datetime(2025, 1, 10, 9, 0, 0, tzinfo=UTC),
author="alice@example.com",
ispatch=True,
)
@@ -232,7 +232,7 @@ def test_commitfest_patches_endpoint_include_parsing(client, open_cf):
PatchOnCommitFest.objects.create(
patch=Patch.objects.create(name="Add feature X"),
commitfest=open_cf,
- enterdate=datetime(2025, 1, 1, 12, 0, 0, tzinfo=timezone.utc),
+ enterdate=datetime(2025, 1, 1, 12, 0, 0, tzinfo=UTC),
)
url = f"/api/v1/commitfests/{open_cf.id}/patches"
@@ -258,7 +258,7 @@ def test_patch_threads_endpoint(client, open_cf, alice):
PatchOnCommitFest.objects.create(
patch=patch,
commitfest=open_cf,
- enterdate=datetime(2025, 1, 1, tzinfo=timezone.utc),
+ enterdate=datetime(2025, 1, 1, tzinfo=UTC),
status=PatchOnCommitFest.STATUS_REVIEW,
)
@@ -266,9 +266,9 @@ def test_patch_threads_endpoint(client, open_cf, alice):
thread1 = MailThread.objects.create(
messageid="abc123@example.com",
subject="[PATCH] Test patch v1",
- firstmessage=datetime(2025, 1, 10, 9, 0, 0, tzinfo=timezone.utc),
+ firstmessage=datetime(2025, 1, 10, 9, 0, 0, tzinfo=UTC),
firstauthor="alice@example.com",
- latestmessage=datetime(2025, 1, 12, 14, 30, 0, tzinfo=timezone.utc),
+ latestmessage=datetime(2025, 1, 12, 14, 30, 0, tzinfo=UTC),
latestauthor="bob@example.com",
latestsubject="Re: [PATCH] Test patch v1",
latestmsgid="def456@example.com",
diff --git a/pgcommitfest/commitfest/tests/test_get_threads.py b/pgcommitfest/commitfest/tests/test_get_threads.py
index 6ca209d6..eb3b448a 100644
--- a/pgcommitfest/commitfest/tests/test_get_threads.py
+++ b/pgcommitfest/commitfest/tests/test_get_threads.py
@@ -11,8 +11,7 @@ def _msg(msgid, date):
def test_get_threads_searches_hackers_and_bugs():
hackers = [
- _msg("h%d" % i, "2026-01-01T%02d:%02d:00" % (i // 60, i % 60))
- for i in range(100)
+ _msg(f"h{i}", f"2026-01-01T{i // 60:02d}:{i % 60:02d}:00") for i in range(100)
]
# b1 is newer than everything on hackers, h99 was sent to both lists
bugs = [_msg("b1", "2026-01-02T00:00:00"), hackers[99]]
@@ -33,6 +32,4 @@ def fake(suburl, params=None):
]
# Merged newest first, h99 deduplicated, and capped at 100 so the oldest
# message (h0) is dropped.
- assert [m["msgid"] for m in result] == ["b1"] + [
- "h%d" % i for i in range(99, 0, -1)
- ]
+ assert [m["msgid"] for m in result] == ["b1"] + [f"h{i}" for i in range(99, 0, -1)]
diff --git a/pgcommitfest/commitfest/tests/test_newpatch_transaction.py b/pgcommitfest/commitfest/tests/test_newpatch_transaction.py
index ca78d14c..403503f5 100644
--- a/pgcommitfest/commitfest/tests/test_newpatch_transaction.py
+++ b/pgcommitfest/commitfest/tests/test_newpatch_transaction.py
@@ -1,6 +1,6 @@
from django.db import connection
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from unittest.mock import patch
import pytest
@@ -26,7 +26,7 @@ def test_newpatch_thread_attach(
client.force_login(alice)
message = {
"msgid": MSGID,
- "date": datetime(2025, 1, 10, 12, tzinfo=timezone.utc),
+ "date": datetime(2025, 1, 10, 12, tzinfo=UTC),
"from": "author@example.com",
"subj": "[PATCH] Test",
"atts": [],
diff --git a/pgcommitfest/commitfest/util.py b/pgcommitfest/commitfest/util.py
index 10f9c816..84f23aea 100644
--- a/pgcommitfest/commitfest/util.py
+++ b/pgcommitfest/commitfest/util.py
@@ -2,13 +2,13 @@
from django.forms.models import model_to_dict
-class DiffableModel(object):
+class DiffableModel:
"""
Make it possible to diff a model.
"""
def __init__(self, *args, **kwargs):
- super(DiffableModel, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.__initial = self._dict
@property
@@ -16,7 +16,7 @@ def diff(self):
manytomanyfieldnames = [f.name for f in self._meta.many_to_many]
d1 = self.__initial
d2 = self._dict
- diffs = dict([(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]])
+ diffs = {k: (v, d2[k]) for k, v in d1.items() if v != d2[k]}
# Foreign key lookups
for k, v in diffs.items():
if (
@@ -36,7 +36,7 @@ def diff(self):
return diffs
def save(self, *args, **kwargs):
- super(DiffableModel, self).save(*args, **kwargs)
+ super().save(*args, **kwargs)
self.__initial = self._dict
@property
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index b9466b5e..91df1a9e 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -257,16 +257,12 @@ def activity(request, cfid=None, rss=None):
# we're evil. And also because the number has been verified
# when looking up the cf itself, so nothing can be injected
# there.
- where = "WHERE EXISTS (SELECT 1 FROM commitfest_patchoncommitfest poc2 WHERE poc2.patch_id=p.id AND poc2.commitfest_id={0})".format(
- cf.id
- )
+ where = f"WHERE EXISTS (SELECT 1 FROM commitfest_patchoncommitfest poc2 WHERE poc2.patch_id=p.id AND poc2.commitfest_id={cf.id})"
else:
cf = None
where = ""
- sql = "SELECT ph.date, auth_user.username AS by, ph.what, p.id AS patchid, p.name, (SELECT max(commitfest_id) FROM commitfest_patchoncommitfest poc WHERE poc.patch_id=p.id) AS cfid FROM commitfest_patchhistory ph INNER JOIN commitfest_patch p ON ph.patch_id=p.id INNER JOIN auth_user on auth_user.id=ph.by_id {0} ORDER BY ph.date DESC LIMIT {1}".format(
- where, num
- )
+ sql = f"SELECT ph.date, auth_user.username AS by, ph.what, p.id AS patchid, p.name, (SELECT max(commitfest_id) FROM commitfest_patchoncommitfest poc WHERE poc.patch_id=p.id) AS cfid FROM commitfest_patchhistory ph INNER JOIN commitfest_patch p ON ph.patch_id=p.id INNER JOIN auth_user on auth_user.id=ph.by_id {where} ORDER BY ph.date DESC LIMIT {num}"
curs = connection.cursor()
curs.execute(sql)
@@ -284,13 +280,11 @@ def activity(request, cfid=None, rss=None):
"commitfest": cf,
"activity": activity,
"title": cf and "Commitfest activity" or "Global Commitfest activity",
- "rss_alternate": cf
- and "/{0}/activity.rss/".format(cf.id)
- or "/activity.rss/",
+ "rss_alternate": cf and f"/{cf.id}/activity.rss/" or "/activity.rss/",
"rss_alternate_title": "PostgreSQL Commitfest Activity Log",
"breadcrumbs": cf
and [
- {"title": cf.title, "href": "/%s/" % cf.pk},
+ {"title": cf.title, "href": f"/{cf.pk}/"},
]
or None,
},
@@ -317,15 +311,13 @@ def redir(request, what, end):
if len(cfs) == 0:
messages.warning(
- request, "No {0} commitfests exist, redirecting to startpage.".format(what)
+ request, f"No {what} commitfests exist, redirecting to startpage."
)
return HttpResponseRedirect("/")
if len(cfs) != 1:
messages.warning(
request,
- "More than one {0} commitfest exists, redirecting to startpage instead.".format(
- what
- ),
+ f"More than one {what} commitfest exists, redirecting to startpage instead.",
)
return HttpResponseRedirect("/")
@@ -392,7 +384,7 @@ def patchlist(request, cf, personalized=False):
has_filter=False,
sortkey=0,
redirect=HttpResponseRedirect(
- "%s?next=%s" % (settings.LOGIN_URL, request.path)
+ f"{settings.LOGIN_URL}?next={request.path}"
),
)
whereclauses.append(
@@ -422,7 +414,7 @@ def patchlist(request, cf, personalized=False):
has_filter=False,
sortkey=0,
redirect=HttpResponseRedirect(
- "%s?next=%s" % (settings.LOGIN_URL, request.path)
+ f"{settings.LOGIN_URL}?next={request.path}"
),
)
whereclauses.append(
@@ -601,7 +593,7 @@ def patchlist(request, cf, personalized=False):
)
if whereclauses:
- where_str = "({0})".format(") AND (".join(whereclauses))
+ where_str = "(" + ") AND (".join(whereclauses) + ")"
else:
where_str = "true"
params = {
@@ -693,7 +685,7 @@ def commitfest(request, cfid):
},
)
statussummary = curs.fetchall()
- statussummary.append([-1, "Total", sum((r[2] for r in statussummary))])
+ statussummary.append([-1, "Total", sum(r[2] for r in statussummary)])
# Generates a fairly expensive query, which we shouldn't do unless
# the user is logged in. XXX: Figure out how to avoid doing that..
@@ -979,11 +971,11 @@ def patch(request, patchid):
"attachnow": "attachthreadnow" in request.GET,
"title": patch.name,
"description": (
- "PostgreSQL patch by %s in the %s commitfest."
- % (patch.authors_string or "unknown author", cf.title)
+ f"PostgreSQL patch by {patch.authors_string or 'unknown author'} "
+ f"in the {cf.title} commitfest."
),
"breadcrumbs": [
- {"title": cf.title, "href": "/%s/" % cf.pk},
+ {"title": cf.title, "href": f"/{cf.pk}/"},
],
"userprofile": getattr(request.user, "userprofile", UserProfile()),
"cfs": CommitFest.relevant_commitfests(),
@@ -1019,7 +1011,7 @@ def patchform(request, patchid):
PatchHistory(
patch=patch,
by=request.user,
- what="Changed %s to %s" % (field, value),
+ what=f"Changed {field} to {value}",
).save_and_notify(
prevcommitter=prevcommitter,
prevreviewers=prevreviewers,
@@ -1027,7 +1019,7 @@ def patchform(request, patchid):
)
r.set_modified()
r.save()
- return HttpResponseRedirect("../../%s/" % r.pk)
+ return HttpResponseRedirect(f"../../{r.pk}/")
# Else fall through and render the page again
else:
form = PatchForm(instance=patch)
@@ -1042,8 +1034,8 @@ def patchform(request, patchid):
"title": "Edit patch",
"tags_data": get_tags_data(),
"breadcrumbs": [
- {"title": cf.title, "href": "/%s/" % cf.pk},
- {"title": "View patch", "href": "/%s/%s/" % (cf.pk, patch.pk)},
+ {"title": cf.title, "href": f"/{cf.pk}/"},
+ {"title": "View patch", "href": f"/{cf.pk}/{patch.pk}/"},
],
},
)
@@ -1092,7 +1084,7 @@ def newpatch(request, cfid):
raise ThreadAttachFailed(
"An error occurred looking up the thread in the archives."
) from e
- return HttpResponseRedirect("/patch/%s/" % (patch.id,))
+ return HttpResponseRedirect(f"/patch/{patch.id}/")
except ThreadAttachFailed as e:
form._errors["threadmsgid"] = form.error_class((str(e),))
else:
@@ -1106,7 +1098,7 @@ def newpatch(request, cfid):
"title": "New patch",
"tags_data": get_tags_data(),
"breadcrumbs": [
- {"title": f"{cf.title} ({cf.periodstring})", "href": "/%s/" % cf.pk},
+ {"title": f"{cf.title} ({cf.periodstring})", "href": f"/{cf.pk}/"},
],
"savebutton": "Create patch",
"threadbrowse": True,
@@ -1137,19 +1129,16 @@ def status(request, patchid, status):
if new_status != poc.status:
poc.set_status(new_status)
PatchHistory(
- patch=poc.patch, by=request.user, what="New status: %s" % poc.statusstring
+ patch=poc.patch, by=request.user, what=f"New status: {poc.statusstring}"
).save_and_notify()
- return HttpResponseRedirect("/patch/%s/" % (poc.patch.id))
+ return HttpResponseRedirect(f"/patch/{poc.patch.id}/")
@require_POST
@login_required
@transaction.atomic
def close(request, patchid, status):
- if status == "next":
- raise Exception("Can't happen, use transition/ endpoint")
-
patch = get_object_or_404(Patch.objects.select_related(), pk=patchid)
cf = patch.current_commitfest()
@@ -1213,7 +1202,7 @@ def close(request, patchid, status):
PatchHistory(
patch=poc.patch,
by=request.user,
- what="Changed committer to %s" % committer,
+ what=f"Changed committer to {committer}",
).save_and_notify(prevcommitter=prevcommitter)
poc.status = PatchOnCommitFest.STATUS_COMMITTED
@@ -1229,8 +1218,7 @@ def close(request, patchid, status):
PatchHistory(
patch=poc.patch,
by=request.user,
- what="Closed in commitfest %s with status: %s"
- % (poc.commitfest, poc.statusstring),
+ what=f"Closed in commitfest {poc.commitfest} with status: {poc.statusstring}",
).save_and_notify()
return HttpResponseRedirect(f"/patch/{patchid}")
@@ -1284,7 +1272,7 @@ def reviewer(request, patchid, status):
PatchHistory(
patch=patch,
by=request.user,
- what="Added %s as reviewer" % request.user.username,
+ what=f"Added {request.user.username} as reviewer",
).save_and_notify()
elif status == "remove" and is_reviewer:
patch.reviewers.remove(request.user)
@@ -1292,7 +1280,7 @@ def reviewer(request, patchid, status):
PatchHistory(
patch=patch,
by=request.user,
- what="Removed %s from reviewers" % request.user.username,
+ what=f"Removed {request.user.username} from reviewers",
).save_and_notify()
return HttpResponseRedirect("../../")
@@ -1343,7 +1331,7 @@ def committer(request, patchid, status):
PatchHistory(
patch=patch,
by=request.user,
- what="Added %s as committer" % request.user.username,
+ what=f"Added {request.user.username} as committer",
).save_and_notify(prevcommitter=prevcommitter)
elif status == "remove" and is_committer:
patch.committer = None
@@ -1351,7 +1339,7 @@ def committer(request, patchid, status):
PatchHistory(
patch=patch,
by=request.user,
- what="Removed %s from committers" % request.user.username,
+ what=f"Removed {request.user.username} from committers",
).save_and_notify(prevcommitter=prevcommitter)
patch.save()
return HttpResponseRedirect("../../")
@@ -1414,13 +1402,10 @@ def send_email(request, cfid):
form.cleaned_data["subject"],
form.cleaned_data["body"],
request.user.username,
- sendername="%s %s via PostgreSQL Commitfest"
- % (request.user.first_name, request.user.last_name),
+ sendername=f"{request.user.first_name} {request.user.last_name} via PostgreSQL Commitfest",
replyto=uw.encoded_email_header,
)
- messages.add_message(
- request, messages.INFO, "Sent email to %s" % r.email
- )
+ messages.add_message(request, messages.INFO, f"Sent email to {r.email}")
return HttpResponseRedirect("..")
else:
authoridstring = request.GET.get("authors", None)
@@ -1455,26 +1440,25 @@ def send_email(request, cfid):
messages.add_message(
request,
messages.INFO,
- "Email will be sent from %s, with replies going to: %s"
- % (settings.NOTIFICATION_FROM, UserWrapper(request.user).email),
+ f"Email will be sent from {settings.NOTIFICATION_FROM}, with replies going to: {UserWrapper(request.user).email}",
)
def _user_and_mail(u):
- return "%s %s (%s)" % (u.first_name, u.last_name, u.email)
+ return f"{u.first_name} {u.last_name} ({u.email})"
if len(authors):
messages.add_message(
request,
messages.INFO,
- "The email will be sent to the following authors: %s"
- % ", ".join([_user_and_mail(u) for u in authors]),
+ "The email will be sent to the following authors: "
+ + ", ".join([_user_and_mail(u) for u in authors]),
)
if len(reviewers):
messages.add_message(
request,
messages.INFO,
- "The email will be sent to the following reviewers: %s"
- % ", ".join([_user_and_mail(u) for u in reviewers]),
+ "The email will be sent to the following reviewers: "
+ + ", ".join([_user_and_mail(u) for u in reviewers]),
)
return render(
@@ -1485,7 +1469,7 @@ def _user_and_mail(u):
"form": form,
"title": "Send email",
"breadcrumbs": [
- {"title": cf.title, "href": "/%s/" % cf.pk},
+ {"title": cf.title, "href": f"/{cf.pk}/"},
],
"savebutton": "Send email",
},
diff --git a/pgcommitfest/commitfest/widgets.py b/pgcommitfest/commitfest/widgets.py
index dea0c7ec..350a7107 100644
--- a/pgcommitfest/commitfest/widgets.py
+++ b/pgcommitfest/commitfest/widgets.py
@@ -5,10 +5,9 @@
class ThreadPickWidget(TextInput):
def render(self, name, value, attrs=None, renderer=None):
attrs["class"] += " threadpick-input"
- html = super(ThreadPickWidget, self).render(name, value, attrs)
+ html = super().render(name, value, attrs)
html = (
html
- + '
'
- % name
+ + f'
'
)
return mark_safe(html)
diff --git a/pgcommitfest/mailqueue/migrations/0001_initial.py b/pgcommitfest/mailqueue/migrations/0001_initial.py
index 38d1214d..27a5508f 100644
--- a/pgcommitfest/mailqueue/migrations/0001_initial.py
+++ b/pgcommitfest/mailqueue/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
from django.db import migrations, models
diff --git a/pgcommitfest/mailqueue/models.py b/pgcommitfest/mailqueue/models.py
index 6b002e7e..7c4d3a02 100644
--- a/pgcommitfest/mailqueue/models.py
+++ b/pgcommitfest/mailqueue/models.py
@@ -9,4 +9,4 @@ class QueuedMail(models.Model):
fullmsg = models.TextField(null=False, blank=False)
def __str__(self):
- return "%s: %s -> %s" % (self.pk, self.sender, self.receiver)
+ return f"{self.pk}: {self.sender} -> {self.receiver}"
diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py
index 48fbbef0..72dbebb2 100644
--- a/pgcommitfest/mailqueue/util.py
+++ b/pgcommitfest/mailqueue/util.py
@@ -43,9 +43,7 @@ def send_simple_mail(
main, sub = contenttype.split("/")
part = MIMENonMultipart(main, sub)
part.set_payload(content)
- part.add_header(
- "Content-Disposition", 'attachment; filename="%s"' % filename
- )
+ part.add_header("Content-Disposition", f'attachment; filename="{filename}"')
encoders.encode_base64(part)
msg.attach(part)
@@ -64,9 +62,11 @@ def send_template_mail(
receiver,
subject,
templatename,
- templateattr={},
+ templateattr=None,
usergenerated=False,
):
+ if templateattr is None:
+ templateattr = {}
send_simple_mail(
sender,
receiver,
diff --git a/pgcommitfest/settings.py b/pgcommitfest/settings.py
index 07e4adaf..f56ec064 100644
--- a/pgcommitfest/settings.py
+++ b/pgcommitfest/settings.py
@@ -176,6 +176,6 @@
# Load local settings overrides
try:
- from .local_settings import * # noqa: F403
+ from .local_settings import *
except ImportError:
pass
diff --git a/pgcommitfest/test_settings.py b/pgcommitfest/test_settings.py
index 7fd6341f..e2d27f4f 100644
--- a/pgcommitfest/test_settings.py
+++ b/pgcommitfest/test_settings.py
@@ -1,6 +1,6 @@
"""Test settings for pgcommitfest."""
-from pgcommitfest.settings import * # noqa: F403
+from pgcommitfest.settings import *
# Disable automatic creation of commitfests during tests
# Tests should explicitly create the commitfests they need
diff --git a/pgcommitfest/urls.py b/pgcommitfest/urls.py
index de80e32c..8530e6aa 100644
--- a/pgcommitfest/urls.py
+++ b/pgcommitfest/urls.py
@@ -2,12 +2,8 @@
from django.urls import re_path
import pgcommitfest.auth
-import pgcommitfest.commitfest.ajax as ajax
-import pgcommitfest.commitfest.apiv1 as apiv1
-import pgcommitfest.commitfest.lookups as lookups
-import pgcommitfest.commitfest.reports as reports
-import pgcommitfest.commitfest.views as views
import pgcommitfest.userprofile.views
+from pgcommitfest.commitfest import ajax, apiv1, lookups, reports, views
# Uncomment the next two lines to enable the admin:
# from django.contrib import admin
diff --git a/pgcommitfest/userprofile/forms.py b/pgcommitfest/userprofile/forms.py
index e0ed5a1b..82d142a1 100644
--- a/pgcommitfest/userprofile/forms.py
+++ b/pgcommitfest/userprofile/forms.py
@@ -9,7 +9,7 @@ class Meta:
exclude = ("user",)
def __init__(self, user, *args, **kwargs):
- super(UserProfileForm, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.user = user
mailhelp = 'To add a new address to choose from, update your user profile on
postgresql.org.'
diff --git a/pgcommitfest/userprofile/migrations/0001_initial.py b/pgcommitfest/userprofile/migrations/0001_initial.py
index 45ad7696..4d9325bb 100644
--- a/pgcommitfest/userprofile/migrations/0001_initial.py
+++ b/pgcommitfest/userprofile/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
from django.conf import settings
from django.db import migrations, models
@@ -70,6 +67,6 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name="userextraemail",
- unique_together=set([("user", "email")]),
+ unique_together={("user", "email")},
),
]
diff --git a/pgcommitfest/userprofile/migrations/0002_notifications.py b/pgcommitfest/userprofile/migrations/0002_notifications.py
index 0d4b0357..2f374d51 100644
--- a/pgcommitfest/userprofile/migrations/0002_notifications.py
+++ b/pgcommitfest/userprofile/migrations/0002_notifications.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
from django.conf import settings
from django.db import migrations, models
diff --git a/pgcommitfest/userprofile/util.py b/pgcommitfest/userprofile/util.py
index 78a17597..e9236e7a 100644
--- a/pgcommitfest/userprofile/util.py
+++ b/pgcommitfest/userprofile/util.py
@@ -4,7 +4,7 @@
from .models import UserExtraEmail, UserProfile
-class UserWrapper(object):
+class UserWrapper:
def __init__(self, user):
self.user = user
@@ -23,11 +23,7 @@ def email(self):
def encoded_email_header(self):
return formataddr(
(
- str(
- Header(
- "%s %s" % (self.user.first_name, self.user.last_name), "utf-8"
- )
- ),
+ str(Header(f"{self.user.first_name} {self.user.last_name}", "utf-8")),
self.email,
)
)
@@ -44,6 +40,6 @@ def handle_user_data(sender, **kwargs):
UserExtraEmail.objects.filter(user=user).exclude(email__in=secondary).delete()
# Then add back any of the ones that aren't there
- current = set([e.email for e in UserExtraEmail.objects.filter(user=user)])
+ current = {e.email for e in UserExtraEmail.objects.filter(user=user)}
for e in set(secondary).difference(current):
UserExtraEmail(user=user, email=e).save()
diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py
index 9f2e7e60..2075aa03 100644
--- a/pgcommitfest/userprofile/views.py
+++ b/pgcommitfest/userprofile/views.py
@@ -11,7 +11,7 @@
@login_required
@transaction.atomic
def userprofile(request):
- (profile, created) = UserProfile.objects.get_or_create(user=request.user)
+ (profile, _created) = UserProfile.objects.get_or_create(user=request.user)
if request.method == "POST":
form = UserProfileForm(request.user, request.POST, instance=profile)
diff --git a/pyproject.toml b/pyproject.toml
index c3a6a178..1e25811c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,8 +18,8 @@ dev = [
"django-stubs",
"uwsgi",
"pycodestyle",
- "ruff",
- "djhtml",
+ "ruff==0.17.2",
+ "djhtml==3.0.11",
"pytest",
"pytest-django",
"freezegun",
@@ -39,6 +39,11 @@ extend-exclude = ['pgcommitfest/auth.py']
[tool.ruff.lint]
extend-select = ["I"]
+[tool.ruff.lint.per-file-ignores]
+# makemigrations generates plain class attributes, and annotating each new
+# migration by hand would be busywork.
+"**/migrations/*.py" = ["RUF012"]
+
[tool.ruff.lint.isort]
section-order = [
"future",
diff --git a/run_dev.py b/run_dev.py
index 543c4ebf..a428fa04 100755
--- a/run_dev.py
+++ b/run_dev.py
@@ -31,5 +31,8 @@
"--static-map",
f"/media/admin={django_path}/contrib/admin/static/admin",
ini_file,
- ]
+ ],
+ # Stopping the dev server with Ctrl-C makes uwsgi exit non-zero, which is
+ # not worth a traceback.
+ check=False,
)
diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py
index e68150ce..73a028bc 100755
--- a/tools/commitfest/check_patches_in_archives.py
+++ b/tools/commitfest/check_patches_in_archives.py
@@ -17,14 +17,16 @@
# Set up for accessing django
sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../"))
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
-import django # noqa: E402
+import django
django.setup()
-from django.conf import settings # noqa: E402
-from django.db import connection # noqa: E402
+from django.conf import settings
+from django.db import connection
-from pgcommitfest.commitfest.models import MailThreadAttachment # noqa: E402
+from pgcommitfest.commitfest.models import MailThreadAttachment
+
+logger = logging.getLogger(__name__)
if __name__ == "__main__":
debug = "--debug" in sys.argv
@@ -39,7 +41,7 @@
mag = magic.open(magic.MIME)
mag.load()
- logging.debug("Updating attachment metadata from archives")
+ logger.debug("Updating attachment metadata from archives")
# Try to fetch/scan all attachments that haven't already been scanned.
# If they have already been scanned, we don't bother.
@@ -47,16 +49,12 @@
# should generally not be a problem because it's not going to be
# downloading a lot...
for a in MailThreadAttachment.objects.filter(ispatch__isnull=True):
- url = "/message-id/attachment/%s/attach" % a.attachmentid
- logging.debug("Checking attachment %s" % a.attachmentid)
+ url = f"/message-id/attachment/{a.attachmentid}/attach"
+ logger.debug(f"Checking attachment {a.attachmentid}")
resp = requests.get(
- "http{0}://{1}:{2}{3}".format(
- settings.ARCHIVES_PORT == 443 and "s" or "",
- settings.ARCHIVES_SERVER,
- settings.ARCHIVES_PORT,
- url,
- ),
+ f"{'https' if settings.ARCHIVES_PORT == 443 else 'http'}://"
+ f"{settings.ARCHIVES_SERVER}:{settings.ARCHIVES_PORT}{url}",
headers={
"Host": settings.ARCHIVES_HOST,
},
@@ -64,12 +62,12 @@
)
if resp.status_code != 200:
- logging.error("Failed to get %s: %s" % (url, resp.status_code))
+ logger.error(f"Failed to get {url}: {resp.status_code}")
continue
# Attempt to identify the file using magic information
mtype = mag.buffer(resp.content)
- logging.debug("Detected MIME type is %s" % mtype)
+ logger.debug(f"Detected MIME type is {mtype}")
# We don't support gzipped or tar:ed patches or anything like
# that at this point - just plain patches.
@@ -77,8 +75,8 @@
a.ispatch = True
else:
a.ispatch = False
- logging.info("Attachment %s is patch: %s" % (a.id, a.ispatch))
+ logger.info(f"Attachment {a.id} is patch: {a.ispatch}")
a.save()
connection.close()
- logging.debug("Done.")
+ logger.debug("Done.")
diff --git a/tools/commitfest/update_archive_threads.py b/tools/commitfest/update_archive_threads.py
index b90348b5..e5063d32 100755
--- a/tools/commitfest/update_archive_threads.py
+++ b/tools/commitfest/update_archive_threads.py
@@ -13,14 +13,16 @@
# Set up for accessing django
sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../"))
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
-import django # noqa: E402
+import django
django.setup()
-from django.db import connection # noqa: E402
+from django.db import connection
-from pgcommitfest.commitfest.ajax import refresh_single_thread # noqa: E402
-from pgcommitfest.commitfest.models import MailThread # noqa: E402
+from pgcommitfest.commitfest.ajax import refresh_single_thread
+from pgcommitfest.commitfest.models import MailThread
+
+logger = logging.getLogger(__name__)
if __name__ == "__main__":
debug = "--debug" in sys.argv
@@ -32,12 +34,12 @@
stream=sys.stdout,
)
- logging.debug("Checking for updated mail threads in the archives")
+ logger.debug("Checking for updated mail threads in the archives")
for thread in MailThread.objects.filter(
patches__commitfests__status__in=(1, 2, 3)
).distinct():
- logging.debug("Checking %s in the archives" % thread.messageid)
+ logger.debug(f"Checking {thread.messageid} in the archives")
refresh_single_thread(thread)
connection.close()
- logging.debug("Done.")
+ logger.debug("Done.")
diff --git a/tools/mail/send_queued_mail.py b/tools/mail/send_queued_mail.py
index 21b31ded..4253a973 100755
--- a/tools/mail/send_queued_mail.py
+++ b/tools/mail/send_queued_mail.py
@@ -15,13 +15,13 @@
# Set up to run in django environment
sys.path.append(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "../../"))
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pgcommitfest.settings")
-import django # noqa: E402
+import django
django.setup()
-from django.db import connection, transaction # noqa: E402
+from django.db import connection, transaction
-from pgcommitfest.mailqueue.models import QueuedMail # noqa: E402
+from pgcommitfest.mailqueue.models import QueuedMail
if __name__ == "__main__":
# Grab advisory lock, if available. Lock id is just a random number