Conform all python files with PEP8 by moving long code lines to new line.

Author: tdunn891

accounts/urls.py

@@ -1,6 +1,8 @@
 from django.conf.urls import url
 from . import views
-from accounts.views import index, logout, login, registration, user_profile, user_list, update_first_name, update_last_name, update_zoomid, grant_staff_access
+from accounts.views import (index, logout, login, registration, user_profile,
+                            user_list, update_first_name, update_last_name,
+                            update_zoomid, grant_staff_access)
 
 urlpatterns = [
     url(r'^logout/$', logout, name='logout'),

accounts/views.py

@@ -145,8 +145,8 @@ def update_zoomid(request, pk):
 def grant_staff_access(request, pk):
     """Allows Code Institute assessors to be immediately granted Staff Access.
     This is to ensure Assessors can see the full feature set.
-    In a non-assessment situation, clicking Request Staff Access link would send email to Admin,
-    who could then set is_staff to True
+    In a non-assessment situation, clicking Request Staff Access link would
+     send email to Admin, who could then set is_staff to True.
     """
     user = get_object_or_404(User, pk=pk)
     if request.method == 'POST':
@@ -157,5 +157,6 @@ def grant_staff_access(request, pk):
             user.is_staff = True
             user.save()
             messages.success(
-                request, "You have been granted Staff Access as a CI Assessor. You can now edit all tickets.")
+                request, ("You have been granted Staff Access as a CI Assessor."
+                          "You can now edit all tickets."))
     return redirect(user_profile)

checkout/forms.py

@@ -24,12 +24,16 @@ class Meta:
         model = Order
         widgets = {
             'full_name': forms.TextInput(attrs={'placeholder': 'Full Name'}),
-            'street_address1': forms.TextInput(attrs={'placeholder': 'Street Address (line 1)'}),
-            'street_address2': forms.TextInput(attrs={'placeholder': 'Street Address (line 2)'}),
-            'town_or_city': forms.TextInput(attrs={'placeholder': 'Town/City'}),
+            'street_address1': forms.TextInput(
+                attrs={'placeholder': 'Street Address (line 1)'}),
+            'street_address2': forms.TextInput(
+                attrs={'placeholder': 'Street Address (line 2)'}),
+            'town_or_city': forms.TextInput(
+                attrs={'placeholder': 'Town/City'}),
             'county': forms.TextInput(attrs={'placeholder': 'County'}),
             'country': forms.TextInput(attrs={'placeholder': 'Country'}),
-            'phone_number': forms.TextInput(attrs={'placeholder': 'Phone Number'}),
+            'phone_number': forms.TextInput(
+                attrs={'placeholder': 'Phone Number'}),
             'postcode': forms.TextInput(attrs={'placeholder': 'Postcode'})
         }
         fields = (

checkout/views.py

@@ -50,7 +50,6 @@ def checkout(request):
                 user.save()
                 messages.success(
                     request, "You have successfully paid. Enjoy PRO!")
-                # request.session['cart'] = {}
 
                 return redirect(reverse('profile'))
             else:
@@ -63,4 +62,7 @@ def checkout(request):
         payment_form = MakePaymentForm()
         order_form = OrderForm()
 
-    return render(request, "checkout.html", {'order_form': order_form, 'payment_form': payment_form, 'publishable': settings.STRIPE_PUBLISHABLE})
+    return render(request, "checkout.html",
+                  {'order_form': order_form,
+                   'payment_form': payment_form,
+                   'publishable': settings.STRIPE_PUBLISHABLE})

issue_tracker/settings.py

@@ -33,7 +33,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    'livereload',
+    # 'livereload',
     'django.contrib.staticfiles',
     'django_forms_bootstrap',
     'accounts',
@@ -55,7 +55,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'simple_history.middleware.HistoryRequestMiddleware',
-    'livereload.middleware.LiveReloadScript',
+    # 'livereload.middleware.LiveReloadScript',
 ]
 
 ROOT_URLCONF = 'issue_tracker.urls'
@@ -80,7 +80,7 @@
 
 # Database
 
-if "DATABASE_URL" in os.environ and development == False:
+if "DATABASE_URL" in os.environ and development is False:
     print('Database URL found. Using POSTGRESQL')
     DATABASES = {
         'default': dj_database_url.parse(os.environ.get('DATABASE_URL'))

issue_tracker/urls.py

@@ -1,24 +1,12 @@
-"""issue_tracker URL Configuration
+"""issue_tracker URL Configuration"""
 
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.11/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
-    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
-"""
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
 from accounts.views import index
 
+
 urlpatterns = [
     url(r'^$', index, name='index'),
     url(r'^admin/', admin.site.urls),

issue_tracker/wsgi.py

@@ -2,9 +2,6 @@
 WSGI config for issue_tracker project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
 """
 
 import os

tickets/forms.py

@@ -19,8 +19,9 @@ class Meta:
         model = Ticket
         widgets = {
             'summary': forms.TextInput(attrs={'placeholder': 'Summary'}),
-            'description': forms.Textarea(attrs={'placeholder': 'Add a description',
-                                                 'rows': 4}),
+            'description': forms.Textarea(
+                attrs={'placeholder': 'Add a description',
+                       'rows': 4}),
         }
         fields = ('ticket_type', 'summary',
                   'description', 'priority',
@@ -39,7 +40,11 @@ class Meta:
         model = Ticket
         widgets = {
             'summary': forms.TextInput(attrs={'placeholder': 'Summary'}),
-            'description': forms.Textarea(attrs={'placeholder': 'Add a description', 'rows': 4}),
+            'description': forms.Textarea(
+                attrs={
+                    'placeholder': 'Add a description',
+                    'rows': 4
+                }),
         }
         fields = ('ticket_type', 'summary',
                   'description', 'priority',
@@ -52,7 +57,8 @@ class Meta:
         model = Comment
         fields = ('comment_body',)
         widgets = {
-            'comment_body': forms.Textarea(attrs={'placeholder': 'Leave a comment', 'rows': 2})
+            'comment_body': forms.Textarea(
+                attrs={'placeholder': 'Leave a comment', 'rows': 2})
         }
         labels = {
             'comment_body': '',

tickets/models.py

@@ -40,7 +40,9 @@ def age(self):
 
     def days_to_resolve(self):
         if self.resolved_date:
-            return int((self.resolved_date.date() - self.created_date.date()).days)
+            return int(
+                (self.resolved_date.date() - self.created_date.date()).days
+            )
         else:
             return None
 

tickets/views.py

@@ -1,39 +1,40 @@
+from accounts.models import Profile
+import datetime
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponse, JsonResponse
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q, Sum, Count
-from .models import Ticket, Comment, HistoricalTicket
-from accounts.models import Profile
 from django.contrib.auth.models import User
-from .forms import AddTicketForm, AddCommentForm, EditTicketForm
+from django.db.models import Q, Sum, Count
+from django.utils.safestring import mark_safe
 from rest_framework import viewsets
+from .forms import AddTicketForm, AddCommentForm, EditTicketForm
+from .models import Ticket, Comment, HistoricalTicket
 from .serializers import TicketSerializer
-from django.utils.safestring import mark_safe
-import datetime
 
 
-# Django REST API
 class RestView(viewsets.ModelViewSet):
+    """Django REST API as data source for Dashboard page"""
     queryset = Ticket.objects.all()
     serializer_class = TicketSerializer
 
-# Dashboard
+
 @login_required()
 def dashboard(request):
+    """Renders Dashboard page with 6 charts"""
     return render(request, 'dashboard.html')
 
-# View Tickets
+
 @login_required()
 def view_tickets(request):
-    """Display All Tickets"""
+    """Renders Tickets page with data table of all tickets"""
     tickets = Ticket.objects.filter()
     return render(request, 'tickets.html', {'tickets': tickets})
 
-# View Single Ticket
+
 @login_required()
 def view_ticket(request, pk):
-    """Display single ticket details, change history and comments"""
+    """View single ticket details, change history and comments"""
     ticket = get_object_or_404(Ticket, pk=pk) if pk else None
     # Change History
     historical_changes = HistoricalTicket.objects.filter(id=pk)
@@ -44,7 +45,6 @@ def view_ticket(request, pk):
         delta = new_record.diff_against(old_record)
         for change in delta.changes:
             if (change.field != 'upvotes'):
-                # if (change.field != 'upvotes' and change.field != 'image'):
                 test_change = {
                     'field': change.field,
                     'new_value': change.new,
@@ -62,7 +62,9 @@ def view_ticket(request, pk):
         if form.is_valid():
             comment_body = form.cleaned_data.get("comment_body")
             comment = Comment(
-                ticket_id=pk, comment_body=comment_body, user_id=request.user.id)
+                ticket_id=pk,
+                comment_body=comment_body,
+                user_id=request.user.id)
             comment.save()
             messages.info(request, "Comment submitted.")
             return redirect(view_ticket, pk)
@@ -75,23 +77,32 @@ def view_ticket(request, pk):
 @login_required()
 def add_ticket(request, pk=None):
     """User Adds Ticket (Bug or Feature)"""
-    # If user has BASIC account, check if user has reached 10 ticket submission limit in current month
+    """If user has BASIC account, check if user has reached 10 ticket
+     submission limit in current month"""
     user = get_object_or_404(User, id=request.user.id)
     user_profile = get_object_or_404(Profile, user_id=request.user.id)
     if not user_profile.is_pro_user:
         today = datetime.datetime.today()
         start_date = datetime.datetime(today.year, today.month, 1)
         end_date = datetime.datetime(
-            today.year + int(today.month / 12), ((today.month % 12) + 1), 1)
+            today.year + int(today.month / 12),
+            ((today.month % 12) + 1), 1)
         tickets_submitted_this_month = Ticket.objects.filter(
-            submitted_by_id=user, created_date__range=(start_date, end_date)).count()
+            submitted_by_id=user,
+            created_date__range=(start_date, end_date)).count()
         if tickets_submitted_this_month > 9:
             messages.warning(
-                request, "You have reached the 10 ticket monthly limit - Go PRO for unlimited tickets.")
+                request, ("You have reached the 10 ticket monthly limit"
+                          " - Go PRO for unlimited tickets."))
             return redirect('checkout')
         else:
             messages.info(
-                request, mark_safe("Note: You have submitted <b>" + str(tickets_submitted_this_month) + "</b> of <b>10</b> free tickets this month. <a href='/checkout/'>Go PRO</a> for unlimited."))
+                request, mark_safe(
+                    ("Note: You have submitted <b>" +
+                     str(tickets_submitted_this_month) +
+                     "</b> of <b>10</b> free tickets this month."
+                     " <a href='/checkout/'>Go PRO</a> for unlimited."
+                     )))
     ticket = get_object_or_404(Ticket, pk=pk) if pk else None
 
     if (request.method == "POST"):
@@ -111,7 +122,7 @@ def add_ticket(request, pk=None):
 
 @login_required()
 def upvote(request, pk=None):
-    """Upvote a Ticket"""
+    """Upvote a Ticket. Increments upvotes by 1."""
     ticket = get_object_or_404(Ticket, pk=pk) if pk else None
     if (request.method == "POST"):
         # Increment upvotes by 1
@@ -129,21 +140,25 @@ def edit_ticket(request, pk=None):
     if (request.method == "POST"):
         form = EditTicketForm(request.POST, request.FILES, instance=ticket)
         if form.is_valid():
-            if ticket.status == 'Resolved' and ticket.resolved_date != None:
-                # If ticket is set to resolved for the first time, set resolved date to now
+            if (ticket.status == 'Resolved' and
+                    ticket.resolved_date is not None):
+                # If ticket is set to resolved for the first time,
+                #  set resolved date to now
                 ticket.resolved_date = datetime.datetime.now()
             ticket = form.save()
             messages.info(
                 request, "Ticket Updated | " + str(ticket.id))
             return redirect(view_tickets)
     else:
         form = EditTicketForm(instance=ticket)
-        return render(request, 'edit_ticket.html', {'form': form, 'ticket': ticket})
+        return render(request, 'edit_ticket.html',
+                      {'form': form, 'ticket': ticket})
 
 
 @login_required()
 def kanban(request):
-    """Show KANBAN View (PRO Feature)"""
+    """Show tickets in KANBAN View with columns
+    representing ticket status (PRO Feature)"""
     # Ensure user is PRO user
     user = get_object_or_404(Profile, user_id=request.user.id)
     if not user.is_pro_user:
@@ -160,12 +175,13 @@ def kanban(request):
             status='Resolved')
         cancelled_tickets = tickets.filter(
             status='Cancelled')
-        return render(request, 'kanban.html', {'tickets': tickets,
-                                               'new_tickets': new_tickets,
-                                               'in_progress_tickets': in_progress_tickets,
-                                               'resolved_tickets': resolved_tickets,
-                                               'cancelled_tickets': cancelled_tickets,
-                                               })
+        return render(request, 'kanban.html',
+                      {'tickets': tickets,
+                       'new_tickets': new_tickets,
+                       'in_progress_tickets': in_progress_tickets,
+                       'resolved_tickets': resolved_tickets,
+                       'cancelled_tickets': cancelled_tickets,
+                       })
 
 
 @login_required()