Import optimisation

PyRIGS/decorators.py

@@ -1,6 +1,6 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.shortcuts import render
 from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse
 
 from RIGS import models

PyRIGS/settings.py

@@ -8,11 +8,12 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
+import datetime
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-import raven
 import secrets
-import datetime
+
+import raven
 from envparse import env
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))

PyRIGS/tests/base.py

@@ -1,15 +1,15 @@
+import os
+import pathlib
+import sys
+from datetime import datetime
+
+import pytz
+from django.conf import settings
 from django.test import LiveServerTestCase
 from selenium import webdriver
+
 from RIGS import models as rigsmodels
 from . import pages
-import os
-import pytz
-from datetime import date, time, datetime, timedelta
-from django.conf import settings
-import PyRIGS.settings
-import sys
-import pathlib
-import inspect
 
 
 def create_datetime(year, month, day, hour, min):

PyRIGS/tests/pages.py

@@ -1,8 +1,8 @@
-from pypom import Page, Region
+from pypom import Page
+from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
-from selenium.webdriver import Chrome
-from selenium.common.exceptions import NoSuchElementException
+
 from PyRIGS.tests import regions
 
 

PyRIGS/tests/regions.py

@@ -1,15 +1,13 @@
-from pypom import Region
-from django.utils import timezone
-from django.conf import settings
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.select import Select
-from selenium.webdriver.common.keys import Keys
-from selenium.common.exceptions import NoSuchElementException
 import datetime
 
+from django.conf import settings
+from pypom import Region
+from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions
+from selenium.webdriver.support.select import Select
+
 
 def parse_bool_from_string(string):
     # Used to convert from attribute strings to boolean values, written after I found this:

PyRIGS/urls.py

@@ -1,16 +1,11 @@
-from django.urls import path, re_path
+from django.conf import settings
 from django.conf.urls import include
 from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib.auth.decorators import login_required
-from django.conf import settings
-from django.views.decorators.clickjacking import xframe_options_exempt
-from django.contrib.auth.views import LoginView
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.urls import path, re_path
 from django.views.generic import TemplateView
-from PyRIGS.decorators import permission_required_with_403
-import RIGS
-import users
-import versioning
+
 from PyRIGS import views
 
 urlpatterns = [

PyRIGS/views.py

@@ -1,27 +1,19 @@
-from django.core.exceptions import PermissionDenied
-from django.http.response import HttpResponseRedirect
-from django.http import HttpResponse
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.views import generic
-from django.contrib.auth.views import LoginView
-from django.db.models import Q
-from django.shortcuts import get_object_or_404
-from django.core import serializers
-from django.conf import settings
-import simplejson
-from django.contrib import messages
 import datetime
-import pytz
 import operator
-from registration.views import RegistrationView
-from django.views.decorators.csrf import csrf_exempt
-
-from RIGS import models, forms
-from assets import models as asset_models
 from functools import reduce
 
-from django.views.decorators.cache import never_cache, cache_page
-from django.utils.decorators import method_decorator
+import simplejson
+from django.contrib import messages
+from django.core import serializers
+from django.core.exceptions import PermissionDenied
+from django.db.models import Q
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.urls import reverse_lazy, reverse, NoReverseMatch
+from django.views import generic
+
+from RIGS import models
+from assets import models as asset_models
 
 
 def is_ajax(request):

RIGS/admin.py

@@ -1,19 +1,18 @@
 from django.contrib import admin
-from RIGS import models, forms
-from users import forms as user_forms
-from django.contrib.auth.admin import UserAdmin
-from django.utils.translation import gettext_lazy as _
-from reversion.admin import VersionAdmin
-
-from django.contrib.admin import helpers
-from django.template.response import TemplateResponse
 from django.contrib import messages
-from django.db import transaction
+from django.contrib.admin import helpers
+from django.contrib.auth.admin import UserAdmin
 from django.core.exceptions import ObjectDoesNotExist
+from django.db import transaction
 from django.db.models import Count
 from django.forms import ModelForm
-
+from django.template.response import TemplateResponse
+from django.utils.translation import gettext_lazy as _
 from reversion import revisions as reversion
+from reversion.admin import VersionAdmin
+
+from RIGS import models
+from users import forms as user_forms
 
 # Register your models here.
 admin.site.register(models.VatRate, VersionAdmin)

RIGS/apps.py

@@ -5,4 +5,4 @@ class RIGSAppConfig(AppConfig):
     name = 'RIGS'
 
     def ready(self):
-        import RIGS.signals
+        pass

RIGS/finance.py

@@ -1,25 +1,21 @@
 import datetime
 import re
 
+import reversion
+from django import forms
 from django.contrib import messages
-from django.urls import reverse_lazy
+from django.db import transaction
+from django.db.models import Q
 from django.http import Http404, HttpResponseRedirect
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
-from django.template import RequestContext
 from django.template.loader import get_template
+from django.urls import reverse_lazy
 from django.views import generic
-from django.db.models import Q
 from z3c.rml import rml2pdf
-from django.db.models import Q
-
-from django.db import transaction
-import reversion
 
 from RIGS import models
 
-from django import forms
-
 forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
 
 

RIGS/forms.py

@@ -1,17 +1,11 @@
+from datetime import datetime
+
+import simplejson
 from django import forms
-from django.utils import formats
 from django.conf import settings
 from django.core import serializers
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
-from django.db import transaction
-from registration.forms import RegistrationFormUniqueEmail
-from django.contrib.auth.forms import AuthenticationForm
-from captcha.fields import ReCaptchaField
-from reversion import revisions as reversion
-import simplejson
-from datetime import datetime
 from django.utils import timezone
+from reversion import revisions as reversion
 
 from RIGS import models
 

RIGS/hs.py

@@ -1,11 +1,11 @@
-from RIGS import models, forms
-from django.views import generic
-from django.utils import timezone
+from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.urls import reverse_lazy
+from django.utils import timezone
+from django.views import generic
 from reversion import revisions as reversion
-from django.db.models import AutoField, ManyToOneRel
-from django.contrib import messages
+
+from RIGS import models, forms
 
 
 class EventRiskAssessmentCreate(generic.CreateView):

RIGS/ical.py

@@ -1,12 +1,11 @@
-from RIGS import models, forms
-from django_ical.views import ICalFeed
-from django.db.models import Q
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.utils import timezone
-from django.conf import settings
-
 import datetime
+
 import pytz
+from django.conf import settings
+from django.db.models import Q
+from django_ical.views import ICalFeed
+
+from RIGS import models
 
 
 def item_guid(item):  # use the rig-id as the ical unique event identifier

RIGS/management/commands/generateSampleData.py

@@ -1,5 +1,5 @@
-from django.core.management.base import BaseCommand, CommandError
 from django.core.management import call_command
+from django.core.management.base import BaseCommand
 
 
 class Command(BaseCommand):

RIGS/management/commands/generateSampleRIGSData.py

@@ -1,11 +1,11 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import Group, Permission
-from django.db import transaction
-from reversion import revisions as reversion
-
 import datetime
 import random
 
+from django.contrib.auth.models import Group, Permission
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+from reversion import revisions as reversion
+
 from RIGS import models
 
 

RIGS/models.py

@@ -1,25 +1,22 @@
 import datetime
 import hashlib
-import pytz
+import random
+import string
+from collections import Counter
+from decimal import Decimal
+from urllib.parse import urlparse
 
+import pytz
 from django import forms
-from django.db import models
-from django.contrib.auth.models import AbstractUser
 from django.conf import settings
+from django.contrib.auth.models import AbstractUser
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.functional import cached_property
 from reversion import revisions as reversion
 from reversion.models import Version
-import string
-
-import random
-from collections import Counter
-from decimal import Decimal
-
-from django.core.exceptions import ValidationError
-from django.urls import reverse_lazy
-
-from urllib.parse import urlparse
 
 
 class Profile(AbstractUser):

RIGS/rigboard.py

@@ -1,36 +1,33 @@
-from io import BytesIO
-import urllib.request
-import urllib.error
-import urllib.parse
-
-from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.views import generic
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponseRedirect
-from django.template import RequestContext
-from django.template.loader import get_template
-from django.conf import settings
-from django.urls import reverse
-from django.urls import reverse_lazy
-from django.core import signing
-from django.http import HttpResponse
-from django.core.exceptions import SuspiciousOperation
-from django.db.models import Q
-from django.contrib import messages
-from django.utils.decorators import method_decorator
-from django.views.decorators.csrf import csrf_exempt
-from django.utils import timezone
-from z3c.rml import rml2pdf
-from PyPDF2 import PdfFileMerger, PdfFileReader
-import simplejson
-import premailer
-
-from RIGS import models, forms
-from PyRIGS import decorators
+import copy
 import datetime
 import re
-import copy
+import urllib.error
+import urllib.parse
+import urllib.request
+from io import BytesIO
+
+import premailer
+import simplejson
+from PyPDF2 import PdfFileMerger, PdfFileReader
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.core import signing
+from django.core.exceptions import SuspiciousOperation
+from django.core.mail import EmailMultiAlternatives
+from django.db.models import Q
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.template.loader import get_template
+from django.urls import reverse
+from django.urls import reverse_lazy
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import generic
+from z3c.rml import rml2pdf
+
+from PyRIGS import decorators
+from RIGS import models, forms
 
 __author__ = 'ghost'
 

RIGS/signals.py

@@ -1,25 +1,24 @@
-import datetime
 import re
-import urllib.request
 import urllib.error
 import urllib.parse
+import urllib.request
 from io import BytesIO
 
-from django.db.models.signals import post_save
 from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.core.cache import cache
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.db.models.signals import post_save
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils import timezone
-from registration.signals import user_activated
 from premailer import Premailer
+from registration.signals import user_activated
+from reversion import revisions as reversion
 from z3c.rml import rml2pdf
 
 from RIGS import models
-from reversion import revisions as reversion
 
 
 def send_eventauthorisation_success_email(instance):

RIGS/templatetags/filters.py

@@ -1,15 +1,15 @@
-from django import template
 from django import forms
+from django import template
 from django.forms.forms import NON_FIELD_ERRORS
 from django.forms.utils import ErrorDict
-from django.utils.text import normalize_newlines
 from django.template.defaultfilters import stringfilter
-from django.utils.safestring import SafeData, mark_safe
-from django.utils.html import escape
-from RIGS import models
-import json
 from django.template.defaultfilters import yesno, title, truncatewords
 from django.urls import reverse_lazy
+from django.utils.html import escape
+from django.utils.safestring import SafeData, mark_safe
+from django.utils.text import normalize_newlines
+
+from RIGS import models
 
 register = template.Library()
 

RIGS/tests/pages.py

@@ -1,14 +1,12 @@
-from pypom import Page, Region
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver import Chrome
 from django.urls import reverse
-from PyRIGS.tests import regions
-from RIGS.tests import regions as rigs_regions
-from PyRIGS.tests.pages import BasePage, FormPage
-from selenium.common.exceptions import NoSuchElementException
+from pypom import Region
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
+from PyRIGS.tests import regions
+from PyRIGS.tests.pages import BasePage, FormPage
+from RIGS.tests import regions as rigs_regions
+
 
 class Index(BasePage):
     URL_TEMPLATE = reverse('index')

RIGS/tests/regions.py

@@ -1,10 +1,6 @@
 from pypom import Region
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.select import Select
-import datetime
+
 from PyRIGS.tests.regions import TextBox, Modal
 
 

RIGS/tests/test_functional.py

@@ -1,22 +1,13 @@
 import datetime
-from datetime import date, time, timedelta
-from urllib.parse import urlparse
+from datetime import date
 
 from django.conf import settings
 from django.core import mail, signing
-from django.core.management import call_command
-from django.db import transaction
 from django.http import HttpResponseBadRequest
 from django.test import TestCase
-from django.test.client import Client
-from django.test.utils import override_settings
 from django.urls import reverse
-from django.utils import timezone
-from reversion import revisions as reversion
-from RIGS import models, urls
-from RIGS.tests import regions
 
-from . import pages
+from RIGS import models
 
 
 class BaseCase(TestCase):

RIGS/tests/test_interaction.py

@@ -1,31 +1,19 @@
 import datetime
 from datetime import date, time, timedelta
-from urllib.parse import urlparse
 
-from django.conf import settings
-from django.core import mail, signing
-from django.core.management import call_command
-from django.db import transaction
-from django.http import HttpResponseBadRequest
 from django.test.client import Client
-from django.test.utils import override_settings
-from django.urls import reverse
 from django.utils import timezone
-from PyRIGS.tests import base
-from PyRIGS.tests import regions as base_regions
-from PyRIGS.tests.base import (AutoLoginTest, BaseTest, animation_is_finished,
-                               screenshot_failure_cls)
-from reversion import revisions as reversion
-from RIGS import models, urls
-from RIGS.tests import regions
-from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.action_chains import ActionChains
 
+from PyRIGS.tests import base
+from PyRIGS.tests import regions as base_regions
+from PyRIGS.tests.base import (AutoLoginTest, animation_is_finished,
+                               screenshot_failure_cls)
+from RIGS import models
+from RIGS.tests import regions
 from . import pages
 
 

RIGS/tests/test_models.py

@@ -1,13 +1,12 @@
-import pytz
-from reversion import revisions as reversion
-from django.conf import settings
-from django.core.exceptions import ValidationError
-from django.test import TestCase
-from RIGS import models
-from versioning import versioning
 from datetime import date, timedelta, datetime, time
 from decimal import *
-from PyRIGS.tests.base import create_browser
+
+import pytz
+from django.conf import settings
+from django.test import TestCase
+from reversion import revisions as reversion
+
+from RIGS import models
 
 
 class ProfileTestCase(TestCase):

RIGS/tests/test_unit.py

@@ -2,13 +2,12 @@ from datetime import date
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.management import call_command
-from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils import timezone
 
 from RIGS import models
-from reversion import revisions as reversion
 
 
 class TestAdminMergeObjects(TestCase):

RIGS/urls.py

@@ -1,11 +1,12 @@
-from django.conf.urls import url
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import login_required
 from django.urls import path, re_path
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import RedirectView
+
 from PyRIGS.decorators import (api_key_required, has_oembed,
                                permission_required_with_403)
-from RIGS import finance, ical, models, rigboard, views, hs
+from RIGS import finance, ical, rigboard, views, hs
 
 urlpatterns = [
     # People

RIGS/views.py

@@ -1,25 +1,5 @@
-from django.core.exceptions import PermissionDenied
-from django.http.response import HttpResponseRedirect
-from django.http import HttpResponse
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.views import generic
-from django.contrib.auth.views import LoginView
-from django.db.models import Q
-from django.shortcuts import get_object_or_404
-from django.core import serializers
-from django.conf import settings
-import simplejson
-import datetime
-import pytz
-import operator
-from registration.views import RegistrationView
-from django.views.decorators.csrf import csrf_exempt
-
-from RIGS import models, forms
-from assets import models as asset_models
-from functools import reduce
-
 from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin
+from RIGS import models
 
 
 class PersonList(GenericListView):

assets/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
 from reversion.admin import VersionAdmin
+
 from assets import models as assets
 
 

assets/forms.py

@@ -1,7 +1,7 @@
 from django import forms
+from django.db.models import Q
 
 from assets import models
-from django.db.models import Q
 
 
 class AssetForm(forms.ModelForm):

assets/management/commands/generateSampleAssetsData.py

@@ -1,9 +1,11 @@
 import random
+
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import timezone
 from reversion import revisions as reversion
-from assets import models
+
 from RIGS import models as rigsmodels
+from assets import models
 
 
 class Command(BaseCommand):

assets/models.py

@@ -1,11 +1,10 @@
 import re
+
 from django.core.exceptions import ValidationError
 from django.db import models, connection
-from django.urls import reverse
-
 from django.db.models.signals import pre_save
 from django.dispatch.dispatcher import receiver
-
+from django.urls import reverse
 from reversion import revisions as reversion
 from reversion.models import Version
 

assets/tests/pages.py

@@ -1,12 +1,11 @@
 # Collection of page object models for use within tests.
-from pypom import Page, Region
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver import Chrome
 from django.urls import reverse
+from pypom import Region
+from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver.common.by import By
+
 from PyRIGS.tests import regions
 from PyRIGS.tests.pages import BasePage, FormPage
-from selenium.common.exceptions import NoSuchElementException
 
 
 class AssetList(BasePage):

assets/tests/test_interaction.py

@@ -1,23 +1,14 @@
-from . import pages
-from django.core.management import call_command
-from django.test import TestCase
-from assets import models
-from django.test.utils import override_settings
-from django.urls import reverse
-from urllib.parse import urlparse
-from RIGS import models as rigsmodels
-from PyRIGS.tests.base import BaseTest, AutoLoginTest, screenshot_failure_cls
-from assets import models, urls
-from reversion import revisions as reversion
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support.ui import WebDriverWait
-from PyRIGS.tests.base import animation_is_finished
 import datetime
+
 from django.utils import timezone
-from selenium.webdriver.common.action_chains import ActionChains
-from django.test import tag
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from PyRIGS.tests.base import AutoLoginTest, screenshot_failure_cls
+from PyRIGS.tests.base import animation_is_finished
+from assets import models
+from . import pages
 
 
 @screenshot_failure_cls

assets/tests/test_unit.py

@@ -1,16 +1,13 @@
+import datetime
+
+import pytest
 from django.core.management import call_command
-from assets import models
 from django.test.utils import override_settings
 from django.urls import reverse
-from urllib.parse import urlparse
-from assets import models, urls
-from reversion import revisions as reversion
-import datetime
-from django.utils import timezone
-from django.test import tag
-import pytest
 from pytest_django.asserts import assertFormError, assertRedirects
 
+from assets import models, urls
+
 pytestmark = pytest.mark.django_db  # TODO
 
 

assets/urls.py

@@ -1,11 +1,9 @@
-from django.conf.urls import url
-from django.urls import path
-from assets import views, models
-from versioning import versioning
-
 from django.contrib.auth.decorators import login_required
+from django.urls import path
 from django.views.decorators.clickjacking import xframe_options_exempt
+
 from PyRIGS.decorators import has_oembed, permission_required_with_403
+from assets import views
 
 urlpatterns = [
     path('', login_required(views.AssetList.as_view()), name='asset_index'),

assets/views.py

@@ -1,21 +1,18 @@
-import datetime
-
 import simplejson
-from assets import forms, models
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core import serializers
 from django.db.models import Q
 from django.http import Http404, HttpResponse, JsonResponse
-from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
-from versioning import versioning
-from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin, is_ajax
-from itertools import chain
+
+from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin, \
+    is_ajax
+from assets import forms, models
 
 
 @method_decorator(csrf_exempt, name='dispatch')

users/forms.py

@@ -1,13 +1,9 @@
-import simplejson
 from captcha.fields import ReCaptchaField
 from django import forms
-from django.conf import settings
 from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm,
                                        UserChangeForm, UserCreationForm)
-from django.core import serializers
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.utils import formats
 from registration.forms import RegistrationFormUniqueEmail
+
 from RIGS import models
 
 

users/regbackend.py

@@ -1,7 +1,7 @@
-from RIGS.models import Profile
-from users.forms import ProfileRegistrationFormUniqueEmail
 from registration.signals import user_registered
 
+from users.forms import ProfileRegistrationFormUniqueEmail
+
 
 def user_created(sender, user, request, **kwargs):
     form = ProfileRegistrationFormUniqueEmail(request.POST)

users/tests/test_users.py

@@ -1,31 +1,12 @@
 import os
 import re
-from datetime import date, time, datetime, timedelta
 
-import pytz
-from django.conf import settings
-from django.core import mail, signing
-from django.db import transaction
-from django.http import HttpResponseBadRequest
-from django.test import LiveServerTestCase, TestCase
-from django.test.client import Client
-from django.urls import reverse
-from reversion import revisions as reversion
-from selenium import webdriver
-from selenium.common.exceptions import StaleElementReferenceException
-from selenium.webdriver.support import expected_conditions
+from django.core import mail
+from django.test import LiveServerTestCase
 from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support.ui import WebDriverWait
 
-from RIGS import models
-
-from reversion import revisions as reversion
-from django.urls import reverse
-from django.core import mail, signing
 from PyRIGS.tests.base import create_browser
-from django.conf import settings
-
-import sys
+from RIGS import models
 
 
 # Functional Tests

users/urls.py

@@ -1,14 +1,12 @@
-from django.urls import path
-from django.conf.urls import include, url
-from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.conf.urls import include
 from django.contrib.auth.decorators import login_required
-from django.conf import settings
-from django.views.decorators.clickjacking import xframe_options_exempt
 from django.contrib.auth.views import LoginView
+from django.urls import path
+from django.views.decorators.clickjacking import xframe_options_exempt
 from registration.backends.default.views import RegistrationView
+
 from PyRIGS.decorators import permission_required_with_403
-from users import regbackend, forms, views
+from users import forms, views
 
 urlpatterns = [
     path('user/register/', RegistrationView.as_view(form_class=forms.ProfileRegistrationFormUniqueEmail),

users/views.py

@@ -1,24 +1,10 @@
-from django.core.exceptions import PermissionDenied
-from django.http.response import HttpResponseRedirect
-from django.http import HttpResponse
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.views import generic
-from django.contrib.auth.views import LoginView
-from django.db.models import Q
-from django.shortcuts import get_object_or_404
-from django.core import serializers
-from django.conf import settings
-import simplejson
 from django.contrib import messages
-import datetime
-import pytz
-import operator
-from registration.views import RegistrationView
+from django.contrib.auth.views import LoginView
+from django.urls import reverse_lazy
+from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
 
-from RIGS import models, forms
-from assets import models as asset_models
-from functools import reduce
+from RIGS import models
 
 
 # This view should be exempt from requiring CSRF token.

versioning/tests/test_versioning.py

@@ -1,14 +1,12 @@
-from reversion import revisions as reversion
-from django.conf import settings
-from django.core.exceptions import ValidationError
+from datetime import date
+
 from django.test import TestCase
 from django.urls import reverse
+from reversion import revisions as reversion
+
 from RIGS import models
 from assets import models as amodels
 from versioning import versioning
-from datetime import date, timedelta, datetime, time
-from decimal import *
-from PyRIGS.tests.base import create_browser
 
 
 # Model Tests

versioning/urls.py

@@ -1,13 +1,9 @@
-from django.conf.urls import url
-from django.contrib.auth.decorators import login_required
 from django.urls import path
-from django.views.decorators.clickjacking import xframe_options_exempt
-from django.views.generic import RedirectView
-from PyRIGS.decorators import (api_key_required, has_oembed,
-                               permission_required_with_403)
-from RIGS import finance, ical, models, rigboard, views, hs
-from versioning import views
 from django.apps import apps
+from django.urls import path
+
+from PyRIGS.decorators import (permission_required_with_403)
+from versioning import views
 
 urlpatterns = [
     path('rigboard/activity/feed/',

versioning/versioning.py

@@ -1,18 +1,13 @@
-import datetime
 import logging
 
 from diff_match_patch import diff_match_patch
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import EmailField, IntegerField, TextField, CharField, BooleanField
-from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
-from django.views import generic
 from reversion.models import Version, VersionQuerySet
+
 from RIGS import models
-from assets import models as asset_models
-from django.apps import apps
-from reversion import revisions as reversion
 
 logger = logging.getLogger('tec.pyrigs')
 

versioning/views.py

@@ -1,23 +1,12 @@
 import datetime
-import logging
 
-from diff_match_patch import diff_match_patch
-from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import EmailField, IntegerField, TextField
-from django.shortcuts import get_object_or_404
-from django.utils.functional import cached_property
-from django.views import generic
-from reversion.models import Version, VersionQuerySet
-from RIGS import models
-from assets import models as asset_models
 from django.apps import apps
-from reversion import revisions as reversion
-from versioning.versioning import RIGSVersion
+from django.shortcuts import get_object_or_404
 from django.template.defaultfilters import title
+from django.views import generic
+from reversion import revisions as reversion
 
-from django.views.decorators.cache import never_cache, cache_page
-from django.utils.decorators import method_decorator
+from versioning.versioning import RIGSVersion
 
 
 class VersionHistory(generic.ListView):