From 9889889f9a1d97101228a2c771909410bf836aa0 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Tue, 4 Feb 2020 16:32:32 +0000 Subject: [PATCH] CHORE: Conform old code to pep8 --- RIGS/finance.py | 17 ++++++++--------- RIGS/rigboard.py | 9 ++++----- RIGS/views.py | 18 +++++++++--------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index f0a4ed43..d536969b 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -125,29 +125,28 @@ class InvoiceArchive(generic.ListView): def get_queryset(self): q = self.request.GET.get('q', "") - + filter = Q(event__name__icontains=q) - #try and parse an int + # try and parse an int try: val = int(q) filter = filter | Q(pk=val) filter = filter | Q(event__pk=val) - except: - #not an integer + except: # noqa + # not an integer pass try: if q[0] == "N": val = int(q[1:]) - filter = Q(event__pk=val) #If string is Nxxxxx then filter by event number + filter = Q(event__pk=val) # If string is Nxxxxx then filter by event number elif q[0] == "#": val = int(q[1:]) - filter = Q(pk=val) #If string is #xxxxx then filter by invoice number - - except: + filter = Q(pk=val) # If string is #xxxxx then filter by invoice number + except: # noqa pass - + object_list = self.model.objects.filter(filter).order_by('-invoice_date') return object_list diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index 9c7f4d4a..d3e75b03 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -256,24 +256,23 @@ class EventArchive(generic.ArchiveIndexView): if start: filter &= Q(start_date__gte=start) - q = self.request.GET.get('q', "") if q is not "": qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q) - #try and parse an int + # try and parse an int try: val = int(q) qfilter = qfilter | Q(pk=val) - except: #not an integer + except: # noqa not an integer pass try: if q[0] == "N": val = int(q[1:]) - qfilter = Q(pk=val) #If string is N###### then do a simple PK filter - except: + qfilter = Q(pk=val) # If string is N###### then do a simple PK filter + except: # noqa pass filter &= qfilter diff --git a/RIGS/views.py b/RIGS/views.py index 7d9b4c73..2e259791 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -93,12 +93,12 @@ class PersonList(generic.ListView): filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) - #try and parse an int + # try and parse an int try: val = int(q) filter = filter | Q(pk=val) - except: - #not an integer + except: # noqa + # not an integer pass object_list = self.model.objects.filter(filter) @@ -156,12 +156,12 @@ class OrganisationList(generic.ListView): filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) - #try and parse an int + # try and parse an int try: val = int(q) filter = filter | Q(pk=val) - except: - #not an integer + except: # noqa + # not an integer pass object_list = self.model.objects.filter(filter) @@ -219,12 +219,12 @@ class VenueList(generic.ListView): filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) - #try and parse an int + # try and parse an int try: val = int(q) filter = filter | Q(pk=val) - except: - #not an integer + except: # noqa + # not an integer pass object_list = self.model.objects.filter(filter)