Fix PEP8 errors detected by new pycodestyle script

helpdesk/lib.py

@@ -271,13 +271,14 @@ def text_is_spam(text, request):
     # False if it is not spam. If it cannot be checked for some reason, we
     # assume it isn't spam.
     from django.contrib.sites.models import Site
+    from django.core.exceptions import ImproperlyConfigured
     try:
         from helpdesk.akismet import Akismet
-    except:
+    except ImportError:
         return False
     try:
         site = Site.objects.get_current()
-    except:
+    except ImproperlyConfigured:
         site = Site(domain='configure-django-sites.com')
 
     ak = Akismet(

helpdesk/management/commands/get_email.py

@@ -165,7 +165,7 @@ def process_queue(q, logger):
                 # in py3, msgRaw is a bytes object, decode to str
                 try:
                     msg = msgRaw.decode("utf-8")
-                except:
+                except UnicodeError:
                     # if couldn't decode easily, just leave it raw
                     msg = msgRaw
             else:
@@ -244,7 +244,7 @@ def process_queue(q, logger):
                 logger.info("Successfully processed message %d, ticket/comment created." % i)
                 try:
                     unlink(m)  # delete message file if ticket was successful
-                except:
+                except OSError:
                     logger.error("Unable to delete message %d." % i)
                 else:
                     logger.info("Successfully deleted message %d." % i)
@@ -257,7 +257,7 @@ def decodeUnknown(charset, string):
         if not charset:
             try:
                 return string.decode('utf-8', 'replace')
-            except:
+            except UnicodeError:
                 return string.decode('iso8859-1', 'replace')
         return unicode(string, charset)
     elif six.PY3:
@@ -265,7 +265,7 @@ def decodeUnknown(charset, string):
             if not charset:
                 try:
                     return str(string, encoding='utf-8', errors='replace')
-                except:
+                except UnicodeError:
                     return str(string, encoding='iso8859-1', errors='replace')
             return str(string, encoding=charset, errors='replace')
         return string

helpdesk/models.py

@@ -525,10 +525,11 @@ class Ticket(models.Model):
         a URL to the submitter of a ticket.
         """
         from django.contrib.sites.models import Site
+        from django.core.exceptions import ImproperlyConfigured
         from django.core.urlresolvers import reverse
         try:
             site = Site.objects.get_current()
-        except:
+        except ImproperlyConfigured:
             site = Site(domain='configure-django-sites.com')
         return u"http://%s%s?ticket=%s&email=%s" % (
             site.domain,
@@ -544,10 +545,11 @@ class Ticket(models.Model):
         a staff member (in emails etc)
         """
         from django.contrib.sites.models import Site
+        from django.core.exceptions import ImproperlyConfigured
         from django.core.urlresolvers import reverse
         try:
             site = Site.objects.get_current()
-        except:
+        except ImproperlyConfigured:
             site = Site(domain='configure-django-sites.com')
         return u"http://%s%s" % (
             site.domain,
@@ -1145,6 +1147,7 @@ def create_usersettings(sender, instance, created, **kwargs):
     if created:
         UserSettings.objects.create(user=instance, settings=DEFAULT_USER_SETTINGS)
 
+
 models.signals.post_save.connect(create_usersettings, sender=settings.AUTH_USER_MODEL)
 
 

helpdesk/settings.py

@@ -4,11 +4,11 @@ Default settings for django-helpdesk.
 """
 
 from django.conf import settings
-
+from django.core.exceptions import ImproperlyConfigured
 
 try:
     DEFAULT_USER_SETTINGS = settings.HELPDESK_DEFAULT_SETTINGS
-except:
+except ImproperlyConfigured:
     DEFAULT_USER_SETTINGS = None
 
 if not isinstance(DEFAULT_USER_SETTINGS, dict):

helpdesk/templatetags/in_list.py

@@ -21,5 +21,6 @@ from django import template
 def in_list(value, arg):
     return value in (arg or [])
 
+
 register = template.Library()
 register.filter(in_list)

helpdesk/templatetags/load_helpdesk_settings.py

@@ -19,5 +19,6 @@ def load_helpdesk_settings(request):
         print(e, file=sys.stderr)
         return ''
 
+
 register = Library()
 register.filter('load_helpdesk_settings', load_helpdesk_settings)

helpdesk/templatetags/saved_queries.py

@@ -22,5 +22,6 @@ def saved_queries(user):
         print(e, file=sys.stderr)
         return ''
 
+
 register = Library()
 register.filter('saved_queries', saved_queries)

helpdesk/templatetags/ticket_to_link.py

@@ -42,5 +42,6 @@ def num_to_link(text):
                 text[:match.start() + 1], url, style, match.groups()[0], text[match.end():])
     return mark_safe(text)
 
+
 register = template.Library()
 register.filter(num_to_link)

helpdesk/templatetags/user_admin_url.py

@@ -24,5 +24,6 @@ def user_admin_url(action):
         user._meta.app_label, model_name,
         action)
 
+
 register = template.Library()
 register.filter(user_admin_url)

helpdesk/urls.py

@@ -29,6 +29,7 @@ class DirectTemplateView(TemplateView):
                     context[key] = value
         return context
 
+
 app_name = 'helpdesk'
 
 urlpatterns = [

helpdesk/views/staff.py

@@ -164,6 +164,8 @@ def dashboard(request):
         'all_tickets_reported_by_current_user': all_tickets_reported_by_current_user,
         'basic_ticket_stats': basic_ticket_stats,
     })
+
+
 dashboard = staff_member_required(dashboard)
 
 
@@ -179,6 +181,8 @@ def delete_ticket(request, ticket_id):
     else:
         ticket.delete()
         return HttpResponseRedirect(reverse('helpdesk:home'))
+
+
 delete_ticket = staff_member_required(delete_ticket)
 
 
@@ -229,6 +233,8 @@ def followup_edit(request, ticket_id, followup_id):
             # delete old followup
             followup.delete()
         return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
+
+
 followup_edit = staff_member_required(followup_edit)
 
 
@@ -242,6 +248,8 @@ def followup_delete(request, ticket_id, followup_id):
     followup = get_object_or_404(FollowUp, id=followup_id)
     followup.delete()
     return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
+
+
 followup_delete = staff_member_required(followup_delete)
 
 
@@ -310,6 +318,8 @@ def view_ticket(request, ticket_id):
         'ticketcc_string': ticketcc_string,
         'SHOW_SUBSCRIBE': show_subscribe,
     })
+
+
 view_ticket = staff_member_required(view_ticket)
 
 
@@ -748,6 +758,8 @@ def mass_update(request):
             t.delete()
 
     return HttpResponseRedirect(reverse('helpdesk:list'))
+
+
 mass_update = staff_member_required(mass_update)
 
 
@@ -931,6 +943,8 @@ def ticket_list(request):
         saved_query=saved_query,
         search_message=search_message,
     ))
+
+
 ticket_list = staff_member_required(ticket_list)
 
 
@@ -948,6 +962,8 @@ def edit_ticket(request, ticket_id):
         form = EditTicketForm(instance=ticket)
 
     return render(request, 'helpdesk/edit_ticket.html', {'form': form})
+
+
 edit_ticket = staff_member_required(edit_ticket)
 
 
@@ -985,6 +1001,8 @@ def create_ticket(request):
             form.fields['assigned_to'].widget = forms.HiddenInput()
 
     return render(request, 'helpdesk/create_ticket.html', {'form': form})
+
+
 create_ticket = staff_member_required(create_ticket)
 
 
@@ -1004,6 +1022,8 @@ def raw_details(request, type):
             raise Http404
 
     raise Http404
+
+
 raw_details = staff_member_required(raw_details)
 
 
@@ -1031,16 +1051,22 @@ def hold_ticket(request, ticket_id, unhold=False):
     ticket.save()
 
     return HttpResponseRedirect(ticket.get_absolute_url())
+
+
 hold_ticket = staff_member_required(hold_ticket)
 
 
 def unhold_ticket(request, ticket_id):
     return hold_ticket(request, ticket_id, unhold=True)
+
+
 unhold_ticket = staff_member_required(unhold_ticket)
 
 
 def rss_list(request):
     return render(request, 'helpdesk/rss_list.html', {'queues': Queue.objects.all()})
+
+
 rss_list = staff_member_required(rss_list)
 
 
@@ -1089,6 +1115,8 @@ def report_index(request):
         'basic_ticket_stats': basic_ticket_stats,
         'dash_tickets': dash_tickets,
     })
+
+
 report_index = staff_member_required(report_index)
 
 
@@ -1121,7 +1149,7 @@ def run_report(request, report):
                 query_params = json.loads(b64decode(str(saved_query.query)).decode())
             else:
                 query_params = json.loads(b64decode(str(saved_query.query)))
-        except:
+        except json.JSONDecodeError:
             return HttpResponseRedirect(reverse('helpdesk:report_index'))
 
         report_queryset = apply_query(report_queryset, query_params)
@@ -1289,6 +1317,8 @@ def run_report(request, report):
         'from_saved_query': from_saved_query,
         'saved_query': saved_query,
     })
+
+
 run_report = staff_member_required(run_report)
 
 
@@ -1306,6 +1336,8 @@ def save_query(request):
     query.save()
 
     return HttpResponseRedirect('%s?saved_query=%s' % (reverse('helpdesk:list'), query.id))
+
+
 save_query = staff_member_required(save_query)
 
 
@@ -1317,6 +1349,8 @@ def delete_saved_query(request, id):
         return HttpResponseRedirect(reverse('helpdesk:list'))
     else:
         return render(request, 'helpdesk/confirm_delete_saved_query.html', {'query': query})
+
+
 delete_saved_query = staff_member_required(delete_saved_query)
 
 
@@ -1331,6 +1365,8 @@ def user_settings(request):
         form = UserSettingsForm(s.settings)
 
     return render(request, 'helpdesk/user_settings.html', {'form': form})
+
+
 user_settings = staff_member_required(user_settings)
 
 
@@ -1338,6 +1374,8 @@ def email_ignore(request):
     return render(request, 'helpdesk/email_ignore_list.html', {
         'ignore_list': IgnoreEmail.objects.all(),
     })
+
+
 email_ignore = superuser_required(email_ignore)
 
 
@@ -1351,6 +1389,8 @@ def email_ignore_add(request):
         form = EmailIgnoreForm(request.GET)
 
     return render(request, 'helpdesk/email_ignore_add.html', {'form': form})
+
+
 email_ignore_add = superuser_required(email_ignore_add)
 
 
@@ -1361,6 +1401,8 @@ def email_ignore_del(request, id):
         return HttpResponseRedirect(reverse('helpdesk:email_ignore'))
     else:
         return render(request, 'helpdesk/email_ignore_del.html', {'ignore': ignore})
+
+
 email_ignore_del = superuser_required(email_ignore_del)
 
 
@@ -1374,6 +1416,8 @@ def ticket_cc(request, ticket_id):
         'copies_to': copies_to,
         'ticket': ticket,
     })
+
+
 ticket_cc = staff_member_required(ticket_cc)
 
 
@@ -1398,6 +1442,8 @@ def ticket_cc_add(request, ticket_id):
         'form_email': form_email,
         'form_user': form_user,
     })
+
+
 ticket_cc_add = staff_member_required(ticket_cc_add)
 
 
@@ -1409,6 +1455,8 @@ def ticket_cc_del(request, ticket_id, cc_id):
         return HttpResponseRedirect(reverse('helpdesk:ticket_cc',
                                             kwargs={'ticket_id': cc.ticket.id}))
     return render(request, 'helpdesk/ticket_cc_del.html', {'cc': cc})
+
+
 ticket_cc_del = staff_member_required(ticket_cc_del)
 
 
@@ -1430,6 +1478,8 @@ def ticket_dependency_add(request, ticket_id):
         'ticket': ticket,
         'form': form,
     })
+
+
 ticket_dependency_add = staff_member_required(ticket_dependency_add)
 
 
@@ -1439,6 +1489,8 @@ def ticket_dependency_del(request, ticket_id, dependency_id):
         dependency.delete()
         return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket_id]))
     return render(request, 'helpdesk/ticket_dependency_del.html', {'dependency': dependency})
+
+
 ticket_dependency_del = staff_member_required(ticket_dependency_del)
 
 
@@ -1455,6 +1507,8 @@ def attachment_del(request, ticket_id, attachment_id):
         'attachment': attachment,
         'filename': attachment.filename,
     })
+
+
 attachment_del = staff_member_required(attachment_del)