Run "ruff format", use 88 line length

Author: JelteF

Diff for: pgcommitfest/auth.py

@@ -77,8 +77,12 @@ def login(request):
         # Now encrypt it
         r = Random.new()
         iv = r.read(16)
-        encryptor = AES.new(SHA.new(settings.SECRET_KEY.encode('ascii')).digest()[:16], AES.MODE_CBC, iv)
-        cipher = encryptor.encrypt(s.encode('ascii') + b' ' * (16 - (len(s) % 16)))  # pad to 16 bytes
+        encryptor = AES.new(
+            SHA.new(settings.SECRET_KEY.encode('ascii')).digest()[:16], AES.MODE_CBC, iv
+        )
+        cipher = encryptor.encrypt(
+            s.encode('ascii') + b' ' * (16 - (len(s) % 16))
+        )  # pad to 16 bytes
 
         return HttpResponseRedirect(
             "%s?d=%s$%s"
@@ -115,9 +119,15 @@ def auth_receive(request):
     # Set up an AES object and decrypt the data we received
     try:
         decryptor = AES.new(
-            base64.b64decode(settings.PGAUTH_KEY), AES.MODE_CBC, base64.b64decode(str(request.GET['i']), "-_")
+            base64.b64decode(settings.PGAUTH_KEY),
+            AES.MODE_CBC,
+            base64.b64decode(str(request.GET['i']), "-_"),
+        )
+        s = (
+            decryptor.decrypt(base64.b64decode(str(request.GET['d']), "-_"))
+            .rstrip(b' ')
+            .decode('utf8')
         )
-        s = decryptor.decrypt(base64.b64decode(str(request.GET['d']), "-_")).rstrip(b' ').decode('utf8')
     except UnicodeDecodeError:
         return HttpResponse("Badly encoded data found", 400)
     except Exception:
@@ -203,15 +213,19 @@ def auth_receive(request):
 
     # Signal that we have information about this user
     auth_user_data_received.send(
-        sender=auth_receive, user=user, userdata={'secondaryemails': data['se'][0].split(',') if 'se' in data else []}
+        sender=auth_receive,
+        user=user,
+        userdata={'secondaryemails': data['se'][0].split(',') if 'se' in data else []},
     )
 
     # Finally, check of we have a data package that tells us where to
     # redirect the user.
     if 'd' in data:
         (ivs, datas) = data['d'][0].split('$')
         decryptor = AES.new(
-            SHA.new(settings.SECRET_KEY.encode('ascii')).digest()[:16], AES.MODE_CBC, base64.b64decode(ivs, b"-_")
+            SHA.new(settings.SECRET_KEY.encode('ascii')).digest()[:16],
+            AES.MODE_CBC,
+            base64.b64decode(ivs, b"-_"),
         )
         s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(b' ').decode('utf8')
         try:
@@ -224,7 +238,9 @@ def auth_receive(request):
     # No redirect specified, see if we have it in our settings
     if hasattr(settings, 'PGAUTH_REDIRECT_SUCCESS'):
         return HttpResponseRedirect(settings.PGAUTH_REDIRECT_SUCCESS)
-    return HttpResponse("Authentication successful, but don't know where to redirect!", status=500)
+    return HttpResponse(
+        "Authentication successful, but don't know where to redirect!", status=500
+    )
 
 
 # Receive API calls from upstream, such as push changes to users
@@ -332,7 +348,9 @@ def user_search(searchterm=None, userid=None):
     (ivs, datas) = r.text.encode('utf8').split(b'&')
 
     # Decryption time
-    decryptor = AES.new(base64.b64decode(settings.PGAUTH_KEY), AES.MODE_CBC, base64.b64decode(ivs, "-_"))
+    decryptor = AES.new(
+        base64.b64decode(settings.PGAUTH_KEY), AES.MODE_CBC, base64.b64decode(ivs, "-_")
+    )
     s = decryptor.decrypt(base64.b64decode(datas, "-_")).rstrip(b' ').decode('utf8')
     j = json.loads(s)
 

Diff for: pgcommitfest/commitfest/ajax.py

@@ -27,7 +27,10 @@ def _archivesAPI(suburl, params=None):
     try:
         resp = requests.get(
             "http{0}://{1}:{2}{3}".format(
-                settings.ARCHIVES_PORT == 443 and 's' or '', settings.ARCHIVES_SERVER, settings.ARCHIVES_PORT, suburl
+                settings.ARCHIVES_PORT == 443 and 's' or '',
+                settings.ARCHIVES_SERVER,
+                settings.ARCHIVES_PORT,
+                suburl,
             ),
             params=params,
             headers={
@@ -76,7 +79,9 @@ def getMessages(request):
 
 
 def refresh_single_thread(thread):
-    r = sorted(_archivesAPI('/message-id.json/%s' % thread.messageid), key=lambda x: x['date'])
+    r = sorted(
+        _archivesAPI('/message-id.json/%s' % thread.messageid), key=lambda x: x['date']
+    )
     if thread.latestmsgid != r[-1]['msgid']:
         # There is now a newer mail in the thread!
         thread.latestmsgid = r[-1]['msgid']
@@ -117,7 +122,10 @@ def annotateMessage(request):
 
             for p in thread.patches.all():
                 PatchHistory(
-                    patch=p, by=request.user, what='Added annotation "%s" to %s' % (textwrap.shorten(msg, 100), msgid)
+                    patch=p,
+                    by=request.user,
+                    what='Added annotation "%s" to %s'
+                    % (textwrap.shorten(msg, 100), msgid),
                 ).save_and_notify()
                 p.set_modified()
                 p.save()
@@ -134,7 +142,8 @@ def deleteAnnotation(request):
         PatchHistory(
             patch=p,
             by=request.user,
-            what='Deleted annotation "%s" from %s' % (annotation.annotationtext, annotation.msgid),
+            what='Deleted annotation "%s" from %s'
+            % (annotation.annotationtext, annotation.msgid),
         ).save_and_notify()
         p.set_modified()
         p.save()
@@ -212,7 +221,9 @@ def doAttachThread(cf, patch, msgid, user):
         m.save()
         parse_and_add_attachments(r, m)
 
-    PatchHistory(patch=patch, by=user, what='Attached mail thread %s' % r[0]['msgid']).save_and_notify()
+    PatchHistory(
+        patch=patch, by=user, what='Attached mail thread %s' % r[0]['msgid']
+    ).save_and_notify()
     patch.update_lastmail()
     patch.set_modified()
     patch.save()
@@ -227,7 +238,11 @@ def detachThread(request):
     thread = get_object_or_404(MailThread, messageid=request.POST['msg'])
 
     patch.mailthread_set.remove(thread)
-    PatchHistory(patch=patch, by=request.user, what='Detached mail thread %s' % request.POST['msg']).save_and_notify()
+    PatchHistory(
+        patch=patch,
+        by=request.user,
+        what='Detached mail thread %s' % request.POST['msg'],
+    ).save_and_notify()
     patch.update_lastmail()
     patch.set_modified()
     patch.save()

Diff for: pgcommitfest/commitfest/feeds.py

@@ -10,7 +10,9 @@ def __init__(self, activity, cf, *args, **kwargs):
         self.activity = activity
         if cf:
             self.cfid = cf.id
-            self.title = self.description = 'PostgreSQL Commitfest {0} Activity Log'.format(cf.name)
+            self.title = self.description = (
+                'PostgreSQL Commitfest {0} Activity Log'.format(cf.name)
+            )
         else:
             self.cfid = None
 
@@ -21,11 +23,17 @@ def item_title(self, item):
         return item['name']
 
     def item_description(self, item):
-        return "<div>Patch: {name}</div><div>User: {by}</div>\n<div>{what}</div>".format(**item)
+        return (
+            "<div>Patch: {name}</div><div>User: {by}</div>\n<div>{what}</div>".format(
+                **item
+            )
+        )
 
     def item_link(self, item):
         if self.cfid:
-            return 'https://commitfest.postgresql.org/{0}/{1}/'.format(self.cfid, item['patchid'])
+            return 'https://commitfest.postgresql.org/{0}/{1}/'.format(
+                self.cfid, item['patchid']
+            )
         else:
             return 'https://commitfest.postgresql.org/{cfid}/{patchid}/'.format(**item)
 

Diff for: pgcommitfest/commitfest/forms.py

@@ -29,10 +29,13 @@ def __init__(self, cf, *args, **kwargs):
         q = Q(patch_author__commitfests=cf) | Q(patch_reviewer__commitfests=cf)
         userchoices = [(-1, '* All'), (-2, '* None'), (-3, '* Yourself')] + [
             (u.id, '%s %s (%s)' % (u.first_name, u.last_name, u.username))
-            for u in User.objects.filter(q).distinct().order_by('first_name', 'last_name')
+            for u in User.objects.filter(q)
+            .distinct()
+            .order_by('first_name', 'last_name')
         ]
         self.fields['targetversion'] = forms.ChoiceField(
-            choices=[('-1', '* All'), ('-2', '* None')] + [(v.id, v.version) for v in TargetVersion.objects.all()],
+            choices=[('-1', '* All'), ('-2', '* None')]
+            + [(v.id, v.version) for v in TargetVersion.objects.all()],
             required=False,
             label="Target version",
         )
@@ -88,12 +91,21 @@ def __init__(self, *args, **kwargs):
             if 'data' in kwargs and str(field) in kwargs['data']:
                 vals.extend([x for x in kwargs['data'].getlist(field)])
             self.fields[field].widget.attrs['data-selecturl'] = url
-            self.fields[field].queryset = self.fields[field].queryset.filter(pk__in=set(vals))
-            self.fields[field].label_from_instance = lambda u: '{} ({})'.format(u.username, u.get_full_name())
+            self.fields[field].queryset = self.fields[field].queryset.filter(
+                pk__in=set(vals)
+            )
+            self.fields[field].label_from_instance = lambda u: '{} ({})'.format(
+                u.username, u.get_full_name()
+            )
 
 
 class NewPatchForm(forms.ModelForm):
-    threadmsgid = forms.CharField(max_length=200, required=True, label='Specify thread msgid', widget=ThreadPickWidget)
+    threadmsgid = forms.CharField(
+        max_length=200,
+        required=True,
+        label='Specify thread msgid',
+        widget=ThreadPickWidget,
+    )
     #    patchfile = forms.FileField(allow_empty_file=False, max_length=50000, label='or upload patch file', required=False, help_text='This may be supported sometime in the future, and would then autogenerate a mail to the hackers list. At such a time, the threadmsgid would no longer be required.')
 
     class Meta:
@@ -115,10 +127,20 @@ def clean_threadmsgid(self):
 
 def _fetch_thread_choices(patch):
     for mt in patch.mailthread_set.order_by('-latestmessage'):
-        ti = sorted(_archivesAPI('/message-id.json/%s' % mt.messageid), key=lambda x: x['date'], reverse=True)
+        ti = sorted(
+            _archivesAPI('/message-id.json/%s' % mt.messageid),
+            key=lambda x: x['date'],
+            reverse=True,
+        )
         yield [
             mt.subject,
-            [('%s,%s' % (mt.messageid, t['msgid']), 'From %s at %s' % (t['from'], t['date'])) for t in ti],
+            [
+                (
+                    '%s,%s' % (mt.messageid, t['msgid']),
+                    'From %s at %s' % (t['from'], t['date']),
+                )
+                for t in ti
+            ],
         ]
 
 
@@ -130,7 +152,10 @@ def _fetch_thread_choices(patch):
 
 def reviewfield(label):
     return forms.MultipleChoiceField(
-        choices=review_state_choices, label=label, widget=forms.CheckboxSelectMultiple, required=False
+        choices=review_state_choices,
+        label=label,
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
     )
 
 
@@ -144,7 +169,9 @@ class CommentForm(forms.Form):
     review_doc = reviewfield('Documentation')
 
     message = forms.CharField(required=True, widget=forms.Textarea)
-    newstatus = forms.ChoiceField(choices=PatchOnCommitFest.OPEN_STATUS_CHOICES(), label='New status')
+    newstatus = forms.ChoiceField(
+        choices=PatchOnCommitFest.OPEN_STATUS_CHOICES(), label='New status'
+    )
 
     def __init__(self, patch, poc, is_review, *args, **kwargs):
         super(CommentForm, self).__init__(*args, **kwargs)
@@ -173,8 +200,13 @@ def clean(self):
         if self.is_review:
             for fn, f in self.fields.items():
                 if fn.startswith('review_') and fn in self.cleaned_data:
-                    if '1' in self.cleaned_data[fn] and '0' not in self.cleaned_data[fn]:
-                        self.errors[fn] = (('Cannot pass a test without performing it!'),)
+                    if (
+                        '1' in self.cleaned_data[fn]
+                        and '0' not in self.cleaned_data[fn]
+                    ):
+                        self.errors[fn] = (
+                            ('Cannot pass a test without performing it!'),
+                        )
         return self.cleaned_data
 
 

Diff for: pgcommitfest/commitfest/lookups.py

@@ -14,13 +14,21 @@ def userlookup(request):
 
     users = User.objects.filter(
         Q(is_active=True),
-        Q(username__icontains=query) | Q(first_name__icontains=query) | Q(last_name__icontains=query),
+        Q(username__icontains=query)
+        | Q(first_name__icontains=query)
+        | Q(last_name__icontains=query),
     )
 
     return HttpResponse(
         json.dumps(
             {
-                'values': [{'id': u.id, 'value': '{} ({})'.format(u.username, u.get_full_name())} for u in users],
+                'values': [
+                    {
+                        'id': u.id,
+                        'value': '{} ({})'.format(u.username, u.get_full_name()),
+                    }
+                    for u in users
+                ],
             }
         ),
         content_type='application/json',

Diff for: pgcommitfest/commitfest/management/commands/send_notifications.py

@@ -16,12 +16,19 @@ def handle(self, *args, **options):
             # Django doesn't do proper group by in the ORM, so we have to
             # build our own.
             matches = {}
-            for n in PendingNotification.objects.all().order_by('user', 'history__patch__id', 'history__id'):
+            for n in PendingNotification.objects.all().order_by(
+                'user', 'history__patch__id', 'history__id'
+            ):
                 if n.user.id not in matches:
                     matches[n.user.id] = {'user': n.user, 'patches': {}}
                 if n.history.patch.id not in matches[n.user.id]['patches']:
-                    matches[n.user.id]['patches'][n.history.patch.id] = {'patch': n.history.patch, 'entries': []}
-                matches[n.user.id]['patches'][n.history.patch.id]['entries'].append(n.history)
+                    matches[n.user.id]['patches'][n.history.patch.id] = {
+                        'patch': n.history.patch,
+                        'entries': [],
+                    }
+                matches[n.user.id]['patches'][n.history.patch.id]['entries'].append(
+                    n.history
+                )
                 n.delete()
 
             # Ok, now let's build emails from this