PEP8 all the things

PyRIGS/settings.py

@@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import raven
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -144,8 +145,6 @@ LOGGING = {
     }
 }
 
-import raven
-
 RAVEN_CONFIG = {
     'dsn': os.environ.get('RAVEN_DSN'),
     # If you are using git, you can also automatically configure the

PyRIGS/wsgi.py

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings")
 
-from django.core.wsgi import get_wsgi_application
-from dj_static import Cling
+from django.core.wsgi import get_wsgi_application  # noqa
+from dj_static import Cling  # noqa
 
 application = Cling(get_wsgi_application())

RIGS/finance.py

@@ -95,6 +95,7 @@ class InvoiceVoid(generic.View):
             return HttpResponseRedirect(reverse_lazy('invoice_list'))
         return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
 
+
 class InvoiceDelete(generic.DeleteView):
     model = models.Invoice
 
@@ -115,6 +116,7 @@ class InvoiceDelete(generic.DeleteView):
     def get_success_url(self):
         return self.request.POST.get('next')
 
+
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
     template_name = 'RIGS/invoice_list_archive.html'
@@ -144,8 +146,8 @@ class InvoiceWaiting(generic.ListView):
             (
                 Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
                 Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
-            ) & Q(invoice__isnull=True) # Has not already been invoiced
-            & Q(is_rig=True) # Is a rig (not non-rig)
+            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
+            Q(is_rig=True)  # Is a rig (not non-rig)
 
         ).order_by('start_date') \
             .select_related('person',
@@ -176,7 +178,7 @@ class PaymentCreate(generic.CreateView):
     def get_initial(self):
         initial = super(generic.CreateView, self).get_initial()
         invoicepk = self.request.GET.get('invoice', self.request.POST.get('invoice', None))
-        if invoicepk == None:
+        if invoicepk is None:
             raise Http404()
         invoice = get_object_or_404(models.Invoice, pk=invoicepk)
         initial.update({'invoice': invoice})

RIGS/forms.py

@@ -1,4 +1,3 @@
-__author__ = 'Ghost'
 from django import forms
 from django.utils import formats
 from django.conf import settings
@@ -16,6 +15,8 @@ forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'})
 forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
 
 # Registration
+
+
 class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
     captcha = ReCaptchaField()
 

RIGS/ical.py

@@ -5,7 +5,9 @@ from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
 from django.utils import timezone
 from django.conf import settings
 
-import datetime, pytz
+import datetime
+import pytz
+
 
 class CalendarICS(ICalFeed):
     """
@@ -97,7 +99,7 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if type(item.latest_time) is datetime.date: # Ical end_datetime is non-inclusive, so add a day
+        if isinstance(item.latest_time, datetime.date):  # Ical end_datetime is non-inclusive, so add a day
             return item.latest_time + datetime.timedelta(days=1)
 
         return item.latest_time
@@ -119,7 +121,6 @@ class CalendarICS(ICalFeed):
         desc += 'Status = ' + str(item.get_status_display()) + '\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
 
-        
         desc += '\n'
         if item.meet_at:
             desc += 'Crew Meet = ' + (item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'

RIGS/management/commands/generateSampleData.py

@@ -7,6 +7,8 @@ import datetime
 import random
 
 from RIGS import models
+
+
 class Command(BaseCommand):
     help = 'Adds sample data to use for testing'
     can_import_settings = True
@@ -19,7 +21,6 @@ class Command(BaseCommand):
     keyholder_group = None
     finance_group = None
 
-
     def handle(self, *args, **options):
         from django.conf import settings
 
@@ -44,7 +45,8 @@ class Command(BaseCommand):
             self.setupUsefulProfiles()
 
     def setupPeople(self):
-        names = ["Regulus Black","Sirius Black","Lavender Brown","Cho Chang","Vincent Crabbe","Vincent Crabbe","Bartemius Crouch","Fleur Delacour","Cedric Diggory","Alberforth Dumbledore","Albus Dumbledore","Dudley Dursley","Petunia Dursley","Vernon Dursley","Argus Filch","Seamus Finnigan","Nicolas Flamel","Cornelius Fudge","Goyle","Gregory Goyle","Hermione Granger","Rubeus Hagrid","Igor Karkaroff","Viktor Krum","Bellatrix Lestrange","Alice Longbottom","Frank Longbottom","Neville Longbottom","Luna Lovegood","Xenophilius Lovegood","Remus Lupin","Draco Malfoy","Lucius Malfoy","Narcissa Malfoy","Olympe Maxime","Minerva McGonagall","Mad-Eye Moody","Peter Pettigrew","Harry Potter","James Potter","Lily Potter","Quirinus Quirrell","Tom Riddle","Mary Riddle","Lord Voldemort","Rita Skeeter","Severus Snape","Nymphadora Tonks","Dolores Janes Umbridge","Arthur Weasley","Bill Weasley","Charlie Weasley","Fred Weasley","George Weasley","Ginny Weasley","Molly Weasley","Percy Weasley","Ron Weasley","Dobby","Fluffy","Hedwig","Moaning Myrtle","Aragog","Grawp"]
+        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood",  # noqa
+                 "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]  # noqa
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -66,7 +68,8 @@ class Command(BaseCommand):
                 self.people.append(newPerson)
 
     def setupOrganisations(self):
-        names = ["Acme, inc.","Widget Corp","123 Warehousing","Demo Company","Smith and Co.","Foo Bars","ABC Telecom","Fake Brothers","QWERTY Logistics","Demo, inc.","Sample Company","Sample, inc","Acme Corp","Allied Biscuit","Ankh-Sto Associates","Extensive Enterprise","Galaxy Corp","Globo-Chem","Mr. Sparkle","Globex Corporation","LexCorp","LuthorCorp","North Central Positronics","Omni Consimer Products","Praxis Corporation","Sombra Corporation","Sto Plains Holdings","Tessier-Ashpool","Wayne Enterprises","Wentworth Industries","ZiffCorp","Bluth Company","Strickland Propane","Thatherton Fuels","Three Waters","Water and Power","Western Gas & Electric","Mammoth Pictures","Mooby Corp","Gringotts","Thrift Bank","Flowers By Irene","The Legitimate Businessmens Club","Osato Chemicals","Transworld Consortium","Universal Export","United Fried Chicken","Virtucon","Kumatsu Motors","Keedsler Motors","Powell Motors","Industrial Automation","Sirius Cybernetics Corporation","U.S. Robotics and Mechanical Men","Colonial Movers","Corellian Engineering Corporation","Incom Corporation","General Products","Leeding Engines Ltd.","Blammo","Input, Inc.","Mainway Toys","Videlectrix","Zevo Toys","Ajax","Axis Chemical Co.","Barrytron","Carrys Candles","Cogswell Cogs","Spacely Sprockets","General Forge and Foundry","Duff Brewing Company","Dunder Mifflin","General Services Corporation","Monarch Playing Card Co.","Krustyco","Initech","Roboto Industries","Primatech","Sonky Rubber Goods","St. Anky Beer","Stay Puft Corporation","Vandelay Industries","Wernham Hogg","Gadgetron","Burleigh and Stronginthearm","BLAND Corporation","Nordyne Defense Dynamics","Petrox Oil Company","Roxxon","McMahon and Tate","Sixty Second Avenue","Charles Townsend Agency","Spade and Archer","Megadodo Publications","Rouster and Sideways","C.H. Lavatory and Sons","Globo Gym American Corp","The New Firm","SpringShield","Compuglobalhypermeganet","Data Systems","Gizmonic Institute","Initrode","Taggart Transcontinental","Atlantic Northern","Niagular","Plow King","Big Kahuna Burger","Big T Burgers and Fries","Chez Quis","Chotchkies","The Frying Dutchman","Klimpys","The Krusty Krab","Monks Diner","Milliways","Minuteman Cafe","Taco Grande","Tip Top Cafe","Moes Tavern","Central Perk","Chasers"]
+        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
+                 "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -90,7 +93,8 @@ class Command(BaseCommand):
                 self.organisations.append(newOrganisation)
 
     def setupVenues(self):
-        names = ["Bear Island","Crossroads Inn","Deepwood Motte","The Dreadfort","The Eyrie","Greywater Watch","The Iron Islands","Karhold","Moat Cailin","Oldstones","Raventree Hall","Riverlands","The Ruby Ford","Saltpans","Seagard","Torrhen's Square","The Trident","The Twins","The Vale of Arryn","The Whispering Wood","White Harbor","Winterfell","The Arbor","Ashemark","Brightwater Keep","Casterly Rock","Clegane's Keep","Dragonstone","Dorne","God's Eye","The Golden Tooth","Harrenhal","Highgarden","Horn Hill","Fingers","King's Landing","Lannisport","Oldtown","Rainswood","Storm's End","Summerhall","Sunspear","Tarth","Castle Black","Craster's Keep","Fist of the First Men","The Frostfangs","The Gift","The Skirling Pass","The Wall","Asshai","Astapor","Braavos","The Dothraki Sea","Lys","Meereen","Myr","Norvos","Pentos","Qarth","Qohor","The Red Waste","Tyrosh","Vaes Dothrak","Valyria","Village of the Lhazareen","Volantis","Yunkai"]
+        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", "The Golden Tooth",  # noqa
+                 "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", "Yunkai"]  # noqa
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -163,7 +167,8 @@ class Command(BaseCommand):
         basicUser.save()
 
     def setupEvents(self):
-        names = ["Outdoor Concert","Hall Open Mic Night","Festival","Weekend Event","Magic Show","Society Ball","Evening Show","Talent Show","Acoustic Evening","Hire of Things","SU Event","End of Term Show","Theatre Show","Outdoor Fun Day","Summer Carnival","Open Days","Magic Show","Awards Ceremony","Debating Event","Club Night","DJ Evening","Building Projection","Choir Concert"]
+        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event",
+                 "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
         descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"]
         notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
 
@@ -200,7 +205,6 @@ class Command(BaseCommand):
                 elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
                     newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
 
-
                 if random.randint(0, 6) > 0:  # 5 in 6 have MIC
                     newEvent.mic = random.choice(self.profiles)
 

RIGS/models.py

@@ -1,6 +1,7 @@
 import datetime
 import hashlib
-import datetime, pytz
+import datetime
+import pytz
 
 from django.db import models
 from django.contrib.auth.models import AbstractUser
@@ -32,7 +33,7 @@ class Profile(AbstractUser):
         size = 20
         chars = string.ascii_letters + string.digits
         new_api_key = ''.join(random.choice(chars) for x in range(size))
-        return new_api_key;
+        return new_api_key
 
     @property
     def profile_picture(self):

RIGS/regbackend.py

@@ -1,5 +1,7 @@
 from RIGS.models import Profile
 from RIGS.forms import ProfileRegistrationFormUniqueEmail
+from registration.signals import user_registered
+
 
 def user_created(sender, user, request, **kwargs):
     form = ProfileRegistrationFormUniqueEmail(request.POST)
@@ -9,5 +11,5 @@ def user_created(sender, user, request, **kwargs):
     user.phone = form.data['phone']
     user.save()
 
-from registration.signals import user_registered
+
 user_registered.connect(user_created)

RIGS/rigboard.py

@@ -1,5 +1,7 @@
 from io import BytesIO
-import urllib.request, urllib.error, urllib.parse
+import urllib.request
+import urllib.error
+import urllib.parse
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.mail import EmailMessage, EmailMultiAlternatives

RIGS/signals.py

@@ -1,5 +1,7 @@
 import re
-import urllib.request, urllib.error, urllib.parse
+import urllib.request
+import urllib.error
+import urllib.parse
 from io import BytesIO
 
 from django.db.models.signals import post_save

RIGS/templatetags/filters.py

@@ -5,14 +5,17 @@ from django.forms.utils import ErrorDict
 
 register = template.Library()
 
+
 @register.filter
 def multiply(value, arg):
     return value * arg
 
+
 @register.filter
 def to_class_name(value):
     return value.__class__.__name__
 
+
 @register.filter
 def nice_errors(form, non_field_msg='General form errors'):
     nice_errors = ErrorDict()
@@ -25,6 +28,7 @@ def nice_errors(form, non_field_msg='General form errors'):
             nice_errors[key] = errors
     return nice_errors
 
+
 def paginator(context, adjacent_pages=3):
     """
     To be used in conjunction with the object_list generic view.
@@ -37,10 +41,12 @@ def paginator(context, adjacent_pages=3):
     page = context['page_obj']
     paginator = context['paginator']
     startPage = max(page.number - adjacent_pages, 1)
-    if startPage <= 3: startPage = 1
+    if startPage <= 3:
+        startPage = 1
     endPage = page.number + adjacent_pages + 1
-    if endPage >= paginator.num_pages - 1: endPage = paginator.num_pages + 1
-    page_numbers = [n for n in range(startPage, endPage) \
+    if endPage >= paginator.num_pages - 1:
+        endPage = paginator.num_pages + 1
+    page_numbers = [n for n in range(startPage, endPage)
                     if n > 0 and n <= paginator.num_pages]
 
     dict = {
@@ -64,8 +70,11 @@ def paginator(context, adjacent_pages=3):
         dict['previous'] = page.previous_page_number()
 
     return dict
+
+
 register.inclusion_tag('pagination.html', takes_context=True)(paginator)
 
+
 @register.simple_tag
 def url_replace(request, field, value):
 
@@ -75,6 +84,7 @@ def url_replace(request, field, value):
 
     return dict_.urlencode()
 
+
 @register.simple_tag
 def orderby(request, field, attr):
 

RIGS/test_functional.py

@@ -35,6 +35,7 @@ def create_browser():
     driver = webdriver.Chrome(chrome_options=options)
     return driver
 
+
 class UserRegistrationTest(LiveServerTestCase):
     def setUp(self):
         self.browser = create_browser()
@@ -166,6 +167,7 @@ class UserRegistrationTest(LiveServerTestCase):
 
         # All is well
 
+
 class EventTest(LiveServerTestCase):
     def setUp(self):
         self.profile = models.Profile(
@@ -173,7 +175,6 @@ class EventTest(LiveServerTestCase):
         self.profile.set_password("EventTestPassword")
         self.profile.save()
 
-
         self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
 
         self.browser = create_browser()
@@ -436,7 +437,7 @@ class EventTest(LiveServerTestCase):
                 self.assertFalse(error.is_displayed())
             except StaleElementReferenceException:
                 pass
-            except:
+            except BaseException:
                 self.assertFail("Element does not appear to have been deleted")
 
             # Check at least some data is preserved. Some = all will be there
@@ -487,7 +488,6 @@ class EventTest(LiveServerTestCase):
         self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk) + '/duplicate/')
         self.authenticate('/event/' + str(testEvent.pk) + '/duplicate/')
 
-
         wait = WebDriverWait(self.browser, 3)  # setup WebDriverWait to use later (to wait for animations)
 
         save = self.browser.find_element_by_xpath(
@@ -543,7 +543,6 @@ class EventTest(LiveServerTestCase):
         # Check the PO hasn't carried through
         self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
 
-
         self.assertIn("N%05d" % testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
 
         self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk))  # Go back to the old event
@@ -568,7 +567,6 @@ class EventTest(LiveServerTestCase):
         # Gets redirected to login and back
         self.authenticate('/event/create/')
 
-
         wait = WebDriverWait(self.browser, 3)  # setup WebDriverWait to use later (to wait for animations)
 
         wait.until(animation_is_finished())
@@ -653,7 +651,6 @@ class EventTest(LiveServerTestCase):
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
         self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-26'")
 
-
         self.browser.execute_script("document.getElementById('id_start_time').value=''")
         self.browser.execute_script("document.getElementById('id_end_time').value=''")
 
@@ -671,7 +668,6 @@ class EventTest(LiveServerTestCase):
         # Gets redirected to login and back
         self.authenticate('/event/create/')
 
-
         wait = WebDriverWait(self.browser, 3)  # setup WebDriverWait to use later (to wait for animations)
         self.browser.implicitly_wait(3)  # Set session-long wait (only works for non-existant DOM objects)
 
@@ -750,7 +746,6 @@ class EventTest(LiveServerTestCase):
 
         organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
 
-
     def testEventEdit(self):
         person = models.Person(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123").save()
         organisation = models.Organisation(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save()
@@ -810,6 +805,7 @@ class EventTest(LiveServerTestCase):
         tz = pytz.timezone(settings.TIME_ZONE)
         return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
 
+
 class IcalTest(LiveServerTestCase):
     def setUp(self):
         self.all_events = set(range(1, 18))
@@ -871,7 +867,6 @@ class IcalTest(LiveServerTestCase):
         models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED,
                                     description="non rig today cancelled")
 
-
         self.browser = create_browser()
         self.browser.implicitly_wait(3)  # Set implicit wait session wide
         os.environ['RECAPTCHA_TESTING'] = 'True'

RIGS/test_models.py

@@ -575,4 +575,3 @@ class RIGSVersionTestCase(TestCase):
 
         self.assertEqual(diffs[0].old.name, "New Name")
         self.assertTrue(diffs[0].new is None)
-        

RIGS/test_unit.py

@@ -9,6 +9,7 @@ from django.test.utils import override_settings
 from RIGS import models
 from reversion import revisions as reversion
 
+
 class TestAdminMergeObjects(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -159,6 +160,7 @@ class TestAdminMergeObjects(TestCase):
                 continue
             self.assertEqual(updatedEvent.organisation, self.organisations[1])
 
+
 class TestInvoiceDelete(TestCase):
     @classmethod
     def setUpTestData(cls):
@@ -327,7 +329,6 @@ class TestVersioningViews(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
-
 class TestEmbeddedViews(TestCase):
     @classmethod
     def setUpTestData(cls):

RIGS/views.py

@@ -9,7 +9,8 @@ from django.core import serializers
 from django.conf import settings
 import simplejson
 from django.contrib import messages
-import datetime, pytz
+import datetime
+import pytz
 import operator
 from registration.views import RegistrationView
 from django.views.decorators.csrf import csrf_exempt
@@ -21,6 +22,8 @@ from functools import reduce
 """
 Displays the current rig count along with a few other bits and pieces
 """
+
+
 class Index(generic.TemplateView):
     template_name = 'RIGS/index.html'
 
@@ -29,6 +32,7 @@ class Index(generic.TemplateView):
         context['rig_count'] = models.Event.objects.rig_count()
         return context
 
+
 def login(request, **kwargs):
     if request.user.is_authenticated():
         next = request.GET.get('next', '/')
@@ -61,12 +65,13 @@ def login_embed(request, **kwargs):
         return login(request, template_name="registration/login_embed.html")
 
 
-
 """
 Called from a modal window (e.g. when an item is submitted to an event/invoice).
 May optionally also include some javascript in a success message to cause a load of
 the new information onto the page.
 """
+
+
 class CloseModal(generic.TemplateView):
     template_name = 'closemodal.html'
 
@@ -300,7 +305,6 @@ class SecureAPIRequest(generic.View):
                     qs.append(q)
                 queries.append(reduce(operator.or_, qs))
 
-
             # Build the data response list
             results = []
             query = reduce(operator.and_, queries)
@@ -349,6 +353,7 @@ class SecureAPIRequest(generic.View):
 
         return HttpResponse(model)
 
+
 class ProfileDetail(generic.DetailView):
     model = models.Profile
 
@@ -361,6 +366,7 @@ class ProfileDetail(generic.DetailView):
 
         return self.model.objects.filter(pk=pk)
 
+
 class ProfileUpdateSelf(generic.UpdateView):
     model = models.Profile
     fields = ['first_name', 'last_name', 'email', 'initials', 'phone']
@@ -375,6 +381,7 @@ class ProfileUpdateSelf(generic.UpdateView):
         url = reverse_lazy('profile_detail')
         return url
 
+
 class ResetApiKey(generic.RedirectView):
     def get_redirect_url(self, *args, **kwargs):
         self.request.user.api_key = self.request.user.make_api_key()

importer.py

@@ -19,6 +19,7 @@ from multiprocessing import Process
 # Slight fix for needing to restablish the connection
 connection.close()
 
+
 def fix_email(email):
     if not (email is None or email is "") and ("@" not in email):
         email += "@nottingham.ac.uk"
@@ -258,7 +259,7 @@ def import_nonrigs(delete=False):
     if (delete):
         try:
             models.Event.objects.filter(is_rig=False).delete()
-        except:
+        except BaseException:
             pass
     cursor = setup_cursor()
     if cursor is None:
@@ -286,7 +287,7 @@ def import_invoices(delete=False):
         try:
             models.Invoice.objects.all().delete()
             models.Payment.objects.all().delete()
-        except:
+        except BaseException:
             pass
     cursor = setup_cursor()
     if cursor is None:
@@ -332,6 +333,7 @@ def import_invoices(delete=False):
             p2.date = datetime.date.today()
             p2.save()
 
+
 @transaction.atomic
 def main():
     # processs = []
@@ -368,5 +370,6 @@ def main():
         cursor = connections['default'].cursor()
         cursor.execute(sql)
 
+
 if __name__ == "__main__":
     main()

setup.cfg

@@ -0,0 +1,2 @@
+[pep8]
+max-line-length = 320