fixing views.py (except deprecated api)

helpdesk/views/feeds.py

@@ -168,4 +168,3 @@ class OpenTicketsByQueue(Feed):
             return item.assigned_to.get_username()
         else:
             return _('Unassigned')
-

helpdesk/views/staff.py

@@ -299,7 +299,6 @@ def view_ticket(request, ticket_id):
     else:
         users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
 
-
     # TODO: shouldn't this template get a form to begin with?
     form = TicketForm(initial={'due_date': ticket.due_date})
 
@@ -521,7 +520,7 @@ def update_ticket(request, ticket_id, public=False):
         c.save()
         ticket.due_date = due_date
 
-    if new_status in [ Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS ]:
+    if new_status in (Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS):
         if new_status == Ticket.RESOLVED_STATUS or ticket.resolution is None:
             ticket.resolution = comment
 
@@ -831,13 +830,12 @@ def ticket_list(request):
             # Query deserialization failed. (E.g. was a pickled query)
             return HttpResponseRedirect(reverse('helpdesk_list'))
 
-    elif not ('queue' in request.GET
-              or 'assigned_to' in request.GET
-              or 'status' in request.GET
-              or 'q' in request.GET
-              or 'sort' in request.GET
-              or 'sortreverse' in request.GET
-              ):
+    elif not ('queue' in request.GET or
+              'assigned_to' in request.GET or
+              'status' in request.GET or
+              'q' in request.GET or
+              'sort' in request.GET or
+              'sortreverse' in request.GET):
 
         # Fall-back if no querying is being done, force the list to only
         # show open/reopened/resolved (not closed) cases sorted by creation
@@ -1113,7 +1111,8 @@ def run_report(request, report):
     # a second table for more complex queries
     summarytable2 = defaultdict(int)
 
-    month_name = lambda m: MONTHS_3[m].title()
+    def month_name(m):
+        MONTHS_3[m].title()
 
     first_ticket = Ticket.objects.all().order_by('created')[0]
     first_month = first_ticket.created.month