Import optimisation

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')