mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-02-18 20:39:41 +00:00
CHORE: Conform old code to pep8
This commit is contained in:
@@ -133,7 +133,7 @@ class InvoiceArchive(generic.ListView):
|
|||||||
val = int(q)
|
val = int(q)
|
||||||
filter = filter | Q(pk=val)
|
filter = filter | Q(pk=val)
|
||||||
filter = filter | Q(event__pk=val)
|
filter = filter | Q(event__pk=val)
|
||||||
except:
|
except: # noqa
|
||||||
# not an integer
|
# not an integer
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -144,8 +144,7 @@ class InvoiceArchive(generic.ListView):
|
|||||||
elif q[0] == "#":
|
elif q[0] == "#":
|
||||||
val = int(q[1:])
|
val = int(q[1:])
|
||||||
filter = Q(pk=val) # If string is #xxxxx then filter by invoice number
|
filter = Q(pk=val) # If string is #xxxxx then filter by invoice number
|
||||||
|
except: # noqa
|
||||||
except:
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
object_list = self.model.objects.filter(filter).order_by('-invoice_date')
|
object_list = self.model.objects.filter(filter).order_by('-invoice_date')
|
||||||
|
|||||||
@@ -256,7 +256,6 @@ class EventArchive(generic.ArchiveIndexView):
|
|||||||
if start:
|
if start:
|
||||||
filter &= Q(start_date__gte=start)
|
filter &= Q(start_date__gte=start)
|
||||||
|
|
||||||
|
|
||||||
q = self.request.GET.get('q', "")
|
q = self.request.GET.get('q', "")
|
||||||
|
|
||||||
if q is not "":
|
if q is not "":
|
||||||
@@ -266,14 +265,14 @@ class EventArchive(generic.ArchiveIndexView):
|
|||||||
try:
|
try:
|
||||||
val = int(q)
|
val = int(q)
|
||||||
qfilter = qfilter | Q(pk=val)
|
qfilter = qfilter | Q(pk=val)
|
||||||
except: #not an integer
|
except: # noqa not an integer
|
||||||
pass
|
pass
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if q[0] == "N":
|
if q[0] == "N":
|
||||||
val = int(q[1:])
|
val = int(q[1:])
|
||||||
qfilter = Q(pk=val) # If string is N###### then do a simple PK filter
|
qfilter = Q(pk=val) # If string is N###### then do a simple PK filter
|
||||||
except:
|
except: # noqa
|
||||||
pass
|
pass
|
||||||
|
|
||||||
filter &= qfilter
|
filter &= qfilter
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ class PersonList(generic.ListView):
|
|||||||
try:
|
try:
|
||||||
val = int(q)
|
val = int(q)
|
||||||
filter = filter | Q(pk=val)
|
filter = filter | Q(pk=val)
|
||||||
except:
|
except: # noqa
|
||||||
# not an integer
|
# not an integer
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -160,7 +160,7 @@ class OrganisationList(generic.ListView):
|
|||||||
try:
|
try:
|
||||||
val = int(q)
|
val = int(q)
|
||||||
filter = filter | Q(pk=val)
|
filter = filter | Q(pk=val)
|
||||||
except:
|
except: # noqa
|
||||||
# not an integer
|
# not an integer
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -223,7 +223,7 @@ class VenueList(generic.ListView):
|
|||||||
try:
|
try:
|
||||||
val = int(q)
|
val = int(q)
|
||||||
filter = filter | Q(pk=val)
|
filter = filter | Q(pk=val)
|
||||||
except:
|
except: # noqa
|
||||||
# not an integer
|
# not an integer
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user