Fixes for pep8 compatibility

Author: mhagander

pgcommitfest/auth.py

@@ -35,6 +35,7 @@
 from Crypto import Random
 import time
 
+
 class AuthBackend(ModelBackend):
     # We declare a fake backend that always fails direct authentication -
     # since we should never be using direct authentication in the first place!
@@ -48,7 +49,7 @@ def authenticate(self, username=None, password=None):
 
 # Handle login requests by sending them off to the main site
 def login(request):
-    if request.GET.has_key('next'):
+    if 'next' in request.GET:
         # Put together an url-encoded dict of parameters we're getting back,
         # including a small nonce at the beginning to make sure it doesn't
         # encrypt the same way every time.
@@ -57,33 +58,35 @@ def login(request):
         r = Random.new()
         iv = r.read(16)
         encryptor = AES.new(SHA.new(settings.SECRET_KEY).digest()[:16], AES.MODE_CBC, iv)
-        cipher = encryptor.encrypt(s + ' ' * (16-(len(s) % 16))) # pad to 16 bytes
+        cipher = encryptor.encrypt(s + ' ' * (16 - (len(s) % 16)))  # pad to 16 bytes
 
         return HttpResponseRedirect("%s?d=%s$%s" % (
-                settings.PGAUTH_REDIRECT,
-                base64.b64encode(iv, "-_"),
-                base64.b64encode(cipher, "-_"),
-                ))
+            settings.PGAUTH_REDIRECT,
+            base64.b64encode(iv, "-_"),
+            base64.b64encode(cipher, "-_"),
+        ))
     else:
         return HttpResponseRedirect(settings.PGAUTH_REDIRECT)
 
+
 # Handle logout requests by logging out of this site and then
 # redirecting to log out from the main site as well.
 def logout(request):
     if request.user.is_authenticated():
         django_logout(request)
     return HttpResponseRedirect("%slogout/" % settings.PGAUTH_REDIRECT)
 
+
 # Receive an authentication response from the main website and try
 # to log the user in.
 def auth_receive(request):
-    if request.GET.has_key('s') and request.GET['s'] == "logout":
+    if request.GET.get('s', '') == 'logout':
         # This was a logout request
         return HttpResponseRedirect('/')
 
-    if not request.GET.has_key('i'):
+    if 'i' not in request.GET:
         return HttpResponse("Missing IV in url!", status=400)
-    if not request.GET.has_key('d'):
+    if 'd' not in request.GET:
         return HttpResponse("Missing data in url!", status=400)
 
     # Set up an AES object and decrypt the data we received
@@ -115,7 +118,7 @@ def auth_receive(request):
             changed = True
         if user.email != data['e'][0]:
             user.email = data['e'][0]
-            changed= True
+            changed = True
         if changed:
             user.save()
     except User.DoesNotExist:
@@ -153,7 +156,7 @@ def auth_receive(request):
 
     # Finally, check of we have a data package that tells us where to
     # redirect the user.
-    if data.has_key('d'):
+    if 'd' in data:
         (ivs, datas) = data['d'][0].split('$')
         decryptor = AES.new(SHA.new(settings.SECRET_KEY).digest()[:16],
                             AES.MODE_CBC,
@@ -163,7 +166,7 @@ def auth_receive(request):
             rdata = urlparse.parse_qs(s, strict_parsing=True)
         except ValueError:
             return HttpResponse("Invalid encrypted data received.", status=400)
-        if rdata.has_key('r'):
+        if 'r' in rdata:
             # Redirect address
             return HttpResponseRedirect(rdata['r'][0])
     # No redirect specified, see if we have it in our settings
@@ -191,7 +194,7 @@ def user_search(searchterm=None, userid=None):
     u = urllib.urlopen('%ssearch/?%s' % (
         settings.PGAUTH_REDIRECT,
         urllib.urlencode(q),
-        ))
+    ))
     (ivs, datas) = u.read().split('&')
     u.close()
 

pgcommitfest/commitfest/admin.py

@@ -2,21 +2,25 @@
 
 from models import *
 
+
 class CommitterAdmin(admin.ModelAdmin):
     list_display = ('user', 'active')
 
+
 class PatchOnCommitFestInline(admin.TabularInline):
     model = PatchOnCommitFest
-    extra=1
+    extra = 1
+
 
 class PatchAdmin(admin.ModelAdmin):
     inlines = (PatchOnCommitFestInline,)
     list_display = ('name', )
-#    list_filter = ('commitfests_set__commitfest__name',)
+
 
 class MailThreadAttachmentAdmin(admin.ModelAdmin):
     list_display = ('date', 'author', 'messageid', 'mailthread',)
 
+
 admin.site.register(Committer, CommitterAdmin)
 admin.site.register(CommitFest)
 admin.site.register(Topic)

pgcommitfest/commitfest/ajax.py

@@ -10,27 +10,30 @@
 import json
 
 from pgcommitfest.auth import user_search
+from models import CommitFest, Patch, MailThread, MailThreadAttachment
+from models import MailThreadAnnotation, PatchHistory
+
 
-class HttpResponseServiceUnavailable(HttpResponse): 
+class HttpResponseServiceUnavailable(HttpResponse):
     status_code = 503
 
+
 class Http503(Exception):
     pass
 
-from models import CommitFest, Patch, MailThread, MailThreadAttachment
-from models import MailThreadAnnotation, PatchHistory
 
 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),
-                            params=params,
-                            headers={
-                                'Host': settings.ARCHIVES_HOST,
-                            },
-                            timeout=settings.ARCHIVES_TIMEOUT,
+        resp = requests.get(
+            "http{0}://{1}:{2}{3}".format(settings.ARCHIVES_PORT == 443 and 's' or '',
+                                          settings.ARCHIVES_SERVER,
+                                          settings.ARCHIVES_PORT,
+                                          suburl),
+            params=params,
+            headers={
+                'Host': settings.ARCHIVES_HOST,
+            },
+            timeout=settings.ARCHIVES_TIMEOUT,
         )
         if resp.status_code != 200:
             if resp.status_code == 404:
@@ -43,9 +46,10 @@ def _archivesAPI(suburl, params=None):
     except Exception as e:
         raise Http503("Failed to communicate with archives backend: %s" % e)
 
+
 def getThreads(request):
-    search = request.GET.has_key('s') and request.GET['s'] or None
-    if request.GET.has_key('a') and request.GET['a'] == "1":
+    search = request.GET.get('s', None)
+    if request.GET.get('a', '0') == '1':
         attachonly = 1
     else:
         attachonly = 0
@@ -58,6 +62,7 @@ def getThreads(request):
     r = _archivesAPI('/list/pgsql-hackers/latest.json', params)
     return sorted(r, key=lambda x: x['date'], reverse=True)
 
+
 def getMessages(request):
     threadid = request.GET['t']
 
@@ -67,6 +72,7 @@ def getMessages(request):
     r = _archivesAPI('/message-id.json/%s' % thread.messageid)
     return sorted(r, key=lambda x: x['date'], reverse=True)
 
+
 def refresh_single_thread(thread):
     r = sorted(_archivesAPI('/message-id.json/%s' % thread.messageid), key=lambda x: x['date'])
     if thread.latestmsgid != r[-1]['msgid']:
@@ -83,6 +89,7 @@ def refresh_single_thread(thread):
             p.lastmail = thread.latestmessage
             p.save()
 
+
 @transaction.atomic
 def annotateMessage(request):
     thread = get_object_or_404(MailThread, pk=int(request.POST['t']))
@@ -112,6 +119,7 @@ def annotateMessage(request):
             return 'OK'
     return 'Message not found in thread!'
 
+
 @transaction.atomic
 def deleteAnnotation(request):
     annotation = get_object_or_404(MailThreadAnnotation, pk=request.POST['id'])
@@ -125,6 +133,7 @@ def deleteAnnotation(request):
 
     return 'OK'
 
+
 def parse_and_add_attachments(threadinfo, mailthread):
     for t in threadinfo:
         if len(t['atts']):
@@ -142,6 +151,7 @@ def parse_and_add_attachments(threadinfo, mailthread):
         # In theory we should remove objects if they don't have an
         # attachment, but how could that ever happen? Ignore for now.
 
+
 @transaction.atomic
 def attachThread(request):
     cf = get_object_or_404(CommitFest, pk=int(request.POST['cf']))
@@ -150,6 +160,7 @@ def attachThread(request):
 
     return doAttachThread(cf, patch, msgid, request.user)
 
+
 def doAttachThread(cf, patch, msgid, user):
     # Note! Must be called in an open transaction!
     r = sorted(_archivesAPI('/message-id.json/%s' % msgid), key=lambda x: x['date'])
@@ -166,10 +177,10 @@ def doAttachThread(cf, patch, msgid, user):
         # While at it, we update the thread entry with the latest data from the
         # archives.
         thread.patches.add(patch)
-        thread.latestmessage=r[-1]['date']
-        thread.latestauthor=r[-1]['from']
-        thread.latestsubject=r[-1]['subj']
-        thread.latestmsgid=r[-1]['msgid']
+        thread.latestmessage = r[-1]['date']
+        thread.latestauthor = r[-1]['from']
+        thread.latestsubject = r[-1]['subj']
+        thread.latestmsgid = r[-1]['msgid']
         thread.save()
     else:
         # No existing thread existed, so create it
@@ -195,6 +206,7 @@ def doAttachThread(cf, patch, msgid, user):
 
     return 'OK'
 
+
 @transaction.atomic
 def detachThread(request):
     cf = get_object_or_404(CommitFest, pk=int(request.POST['cf']))
@@ -209,16 +221,18 @@ def detachThread(request):
 
     return 'OK'
 
+
 def searchUsers(request):
-    if request.GET.has_key('s') and request.GET['s']:
+    if request.GET.get('s', ''):
         return user_search(request.GET['s'])
     else:
         return []
 
+
 def importUser(request):
-    if request.GET.has_key('u') and request.GET['u']:
+    if request.GET.get('u', ''):
         u = user_search(userid=request.GET['u'])
-        if len (u) != 1:
+        if len(u) != 1:
             return "Internal error, duplicate user found"
 
         u = u[0]
@@ -235,7 +249,8 @@ def importUser(request):
     else:
         raise Http404()
 
-_ajax_map={
+
+_ajax_map = {
     'getThreads': getThreads,
     'getMessages': getMessages,
     'attachThread': attachThread,
@@ -246,11 +261,12 @@ def importUser(request):
     'importUser': importUser,
 }
 
+
 # Main entrypoint for /ajax/<command>/
 @csrf_exempt
 @login_required
 def main(request, command):
-    if not _ajax_map.has_key(command):
+    if command not in _ajax_map:
         raise Http404
     try:
         resp = HttpResponse(content_type='application/json')

pgcommitfest/commitfest/feeds.py

@@ -1,5 +1,6 @@
 from django.contrib.syndication.views import Feed
 
+
 class ActivityFeed(Feed):
     title = description = 'Commitfest Activity Log'
     link = 'https://commitfest.postgresql.org/'
@@ -30,7 +31,7 @@ def item_description(self, item):
 
     def item_link(self, item):
         if self.cfid:
-            return 'https://commitfest.postgresql.org/{cfid}/{patchid}/'.format(cfid=self.cfid,**item)
+            return 'https://commitfest.postgresql.org/{cfid}/{patchid}/'.format(cfid=self.cfid, **item)
         else:
             return 'https://commitfest.postgresql.org/{cfid}/{patchid}/'.format(**item)
 

pgcommitfest/commitfest/forms.py

@@ -12,6 +12,7 @@
 from widgets import ThreadPickWidget
 from ajax import _archivesAPI
 
+
 class CommitFestFilterForm(forms.Form):
     text = forms.CharField(max_length=50, required=False)
     status = forms.ChoiceField(required=False)
@@ -28,13 +29,14 @@ def __init__(self, cf, *args, **kwargs):
         self.fields['status'] = forms.ChoiceField(choices=c, required=False)
 
         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')]
+        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')]
         self.fields['author'] = forms.ChoiceField(choices=userchoices, required=False)
         self.fields['reviewer'] = forms.ChoiceField(choices=userchoices, required=False)
 
         for f in ('status', 'author', 'reviewer',):
             self.fields[f].widget.attrs = {'class': 'input-medium'}
 
+
 class PatchForm(forms.ModelForm):
     class Meta:
         model = Patch
@@ -68,21 +70,24 @@ def clean_threadmsgid(self):
             raise ValidationError("Error in API call to validate thread")
         return self.cleaned_data['threadmsgid']
 
+
 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)
         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]]
 
 
 review_state_choices = (
     (0, 'Tested'),
     (1, 'Passed'),
 )
 
+
 def reviewfield(label):
     return forms.MultipleChoiceField(choices=review_state_choices, label=label, widget=forms.CheckboxSelectMultiple, required=False)
 
+
 class CommentForm(forms.Form):
     responseto = forms.ChoiceField(choices=[], required=True, label='In response to')
 
@@ -120,12 +125,13 @@ def clean_responseto(self):
 
     def clean(self):
         if self.is_review:
-            for fn,f in self.fields.items():
-                if fn.startswith('review_') and self.cleaned_data.has_key(fn):
-                    if '1' in self.cleaned_data[fn] and not '0' in self.cleaned_data[fn]:
+            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!'),)
         return self.cleaned_data
 
+
 class BulkEmailForm(forms.Form):
     reviewers = forms.CharField(required=False, widget=HiddenInput())
     authors = forms.CharField(required=False, widget=HiddenInput())

pgcommitfest/commitfest/lookups.py

@@ -22,4 +22,5 @@ def get_item_label(self, item):
         # Display for choice listings
         return u"%s (%s)" % (item.username, item.get_full_name())
 
+
 registry.register(UserLookup)