CSCMETAX-61: [REF] Optimize imports

.githooks/pre-commit

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-import os
 import sys
 
 from flake8.main import git

src/metax_api/api/base/router.py

@@ -14,6 +14,7 @@
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 from rest_framework.routers import DefaultRouter, Route
+
 from .views import (
     ContractViewSet,
     DataCatalogViewSet,
@@ -22,6 +23,7 @@
     FileViewSet
 )
 
+
 class CustomRouter(DefaultRouter):
 
     """

src/metax_api/api/base/serializers/__init__.py

@@ -1,6 +1,6 @@
-from .contract_serializer import ContractSerializer
 from .catalog_record_serializer import CatalogRecordSerializer
-from .directory_serializer import DirectorySerializer
+from .contract_serializer import ContractSerializer
 from .data_catalog_serializer import DataCatalogSerializer
+from .directory_serializer import DirectorySerializer
 from .file_serializer import FileSerializer
 from .xml_metadata_serializer import XmlMetadataSerializer

src/metax_api/api/base/serializers/catalog_record_serializer.py

@@ -1,15 +1,15 @@
+import logging
 from os import path
 
-from rest_framework.serializers import ValidationError
-
 from metax_api.models import CatalogRecord, DataCatalog, File, Contract
 from metax_api.services import CatalogRecordService as CRS, CommonService
-from .data_catalog_serializer import DataCatalogSerializer
+from rest_framework.serializers import ValidationError
+
 from .common_serializer import CommonSerializer
 from .contract_serializer import ContractSerializer
+from .data_catalog_serializer import DataCatalogSerializer
 from .serializer_utils import validate_json
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/api/base/serializers/common_serializer.py

@@ -1,11 +1,11 @@
+import logging
 from collections import OrderedDict
 
-from rest_framework.serializers import ModelSerializer
 from rest_framework.fields import SkipField
 from rest_framework.relations import PKOnlyObject
+from rest_framework.serializers import ModelSerializer
 from rest_framework.serializers import ValidationError
 
-import logging
 _logger = logging.getLogger(__name__)
 d = _logger.debug
 

src/metax_api/api/base/serializers/contract_serializer.py

@@ -1,7 +1,9 @@
 from metax_api.models import Contract
+
 from .common_serializer import CommonSerializer
 from .serializer_utils import validate_json
 
+
 class ContractSerializer(CommonSerializer):
 
     class Meta:

src/metax_api/api/base/serializers/data_catalog_serializer.py

@@ -1,10 +1,13 @@
 from os import path
-from rest_framework.serializers import ValidationError
+
 from metax_api.models import DataCatalog
 from metax_api.services import DataCatalogService as DCS
+from rest_framework.serializers import ValidationError
+
 from .common_serializer import CommonSerializer
 from .serializer_utils import validate_json
 
+
 class DataCatalogSerializer(CommonSerializer):
 
     class Meta:

src/metax_api/api/base/serializers/directory_serializer.py

@@ -1,9 +1,10 @@
-from rest_framework.serializers import ValidationError
+import logging
 
 from metax_api.models import Directory
+from rest_framework.serializers import ValidationError
+
 from .common_serializer import CommonSerializer
 
-import logging
 _logger = logging.getLogger(__name__)
 d = _logger.debug
 

src/metax_api/api/base/serializers/file_serializer.py

@@ -1,11 +1,13 @@
+import logging
+
+from metax_api.models import File, FileStorage
 from rest_framework import serializers
 from rest_framework.serializers import ValidationError
 
-from metax_api.models import File, FileStorage
 from .common_serializer import CommonSerializer
 from .file_storage_serializer import FileStorageSerializer
 from .serializer_utils import validate_json
-import logging
+
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/api/base/serializers/file_storage_serializer.py

@@ -1,6 +1,8 @@
 from metax_api.models import FileStorage
+
 from .common_serializer import CommonSerializer
 
+
 class FileStorageSerializer(CommonSerializer):
 
     class Meta:

src/metax_api/api/base/serializers/xml_metadata_serializer.py

@@ -1,6 +1,8 @@
 from metax_api.models import XmlMetadata
+
 from .common_serializer import CommonSerializer
 
+
 class XmlMetadataSerializer(CommonSerializer):
 
     class Meta:

src/metax_api/api/base/views/__init__.py

@@ -1,6 +1,6 @@
-from .contract_view import ContractViewSet
 from .common_view import CommonViewSet
-from .dataset_view import DatasetViewSet
+from .contract_view import ContractViewSet
 from .data_catalog_view import DataCatalogViewSet
+from .dataset_view import DatasetViewSet
 from .directory_view import DirectoryViewSet
 from .file_view import FileViewSet

src/metax_api/api/base/views/contract_view.py

@@ -1,13 +1,14 @@
+import logging
+
+from metax_api.models import Contract
+from metax_api.services import CommonService
 from rest_framework import status
 from rest_framework.decorators import detail_route
 from rest_framework.response import Response
 
-from metax_api.models import Contract
-from metax_api.services import CommonService
 from .common_view import CommonViewSet
 from ..serializers import ContractSerializer, CatalogRecordSerializer
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/api/base/views/data_catalog_view.py

@@ -1,12 +1,14 @@
-from metax_api.models import DataCatalog
+import logging
+
 from django.http import Http404
-from .common_view import CommonViewSet
-from ..serializers import DataCatalogSerializer
+from metax_api.models import DataCatalog
+from rest_framework import status
 from rest_framework.decorators import detail_route
 from rest_framework.response import Response
-from rest_framework import status
 
-import logging
+from .common_view import CommonViewSet
+from ..serializers import DataCatalogSerializer
+
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/api/base/views/directory_view.py

@@ -1,16 +1,16 @@
 # from django.http import Http404
 # from rest_framework import status
-from rest_framework.response import Response
-
-from rest_framework.decorators import detail_route, list_route
+import logging
 
 from metax_api.api.base.serializers import DirectorySerializer
 from metax_api.exceptions import Http400, Http501
 from metax_api.models import Directory
 from metax_api.services import FileService
+from rest_framework.decorators import detail_route, list_route
+from rest_framework.response import Response
+
 from .common_view import CommonViewSet
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/api/base/views/file_view.py

@@ -1,18 +1,19 @@
+import logging
+
 from django.http import Http404
+from metax_api.exceptions import Http400
+from metax_api.models import File, XmlMetadata
+from metax_api.renderers import XMLRenderer
+from metax_api.services import CommonService, FileService
 from rest_framework import status
 from rest_framework.decorators import detail_route
 from rest_framework.exceptions import ValidationError
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 
-from metax_api.exceptions import Http400
-from metax_api.models import File, XmlMetadata
-from metax_api.renderers import XMLRenderer
-from metax_api.services import CommonService, FileService
 from .common_view import CommonViewSet
 from ..serializers import FileSerializer, XmlMetadataSerializer
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/middleware/identifyapicaller.py

@@ -1,12 +1,12 @@
+import logging
 from base64 import b64decode
-import yaml
 
+import yaml
 from django.conf import settings as django_settings
 from django.http import HttpResponseForbidden
 from metax_api.exceptions import Http403
 from metax_api.utils import executing_test_case, executing_travis
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/models/__init__.py

@@ -1,8 +1,8 @@
 from .catalog_record import AlternateRecordSet, CatalogRecord
 from .contract import Contract
+from .data_catalog import DataCatalog
 from .directory import Directory
 from .file import File
 from .file_storage import FileStorage
-from .data_catalog import DataCatalog
 from .metax_user import MetaxUser
 from .xml_metadata import XmlMetadata

src/metax_api/models/contract.py

@@ -3,6 +3,7 @@
 
 from .common import Common
 
+
 class Contract(Common):
 
     contract_json = JSONField(blank=True, null=True)

src/metax_api/models/data_catalog.py

@@ -3,6 +3,7 @@
 
 from .common import Common
 
+
 class DataCatalog(Common):
 
     catalog_json = JSONField()

src/metax_api/models/file_storage.py

@@ -2,6 +2,7 @@
 
 from .common import Common
 
+
 class FileStorage(Common):
 
     file_storage_json = JSONField(blank=True, null=True)

src/metax_api/models/xml_metadata.py

@@ -3,6 +3,7 @@
 from .common import Common
 from .file import File
 
+
 class XmlMetadata(Common):
 
     namespace = models.CharField(max_length=200)

src/metax_api/onappstart.py

@@ -1,12 +1,11 @@
-from time import sleep
+import logging
 import sys
+from time import sleep
 
 from django.apps import AppConfig
 from django.conf import settings
-
 from metax_api.utils import RedisSentinelCache, executing_test_case, ReferenceDataLoader
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/services/file_service.py

@@ -1,16 +1,16 @@
+import logging
 from os import getpid
 from os.path import dirname, basename
 from time import time
 from uuid import uuid3, NAMESPACE_DNS as UUID_NAMESPACE_DNS
 
 from django.http import Http404
-from rest_framework.serializers import ValidationError
-
 from metax_api.exceptions import Http400
 from metax_api.models import Directory, File
+from rest_framework.serializers import ValidationError
+
 from .common_service import CommonService
 
-import logging
 _logger = logging.getLogger(__name__)
 d = logging.getLogger(__name__).debug
 

src/metax_api/services/reference_data_mixin.py

@@ -1,11 +1,10 @@
+import logging
 from time import sleep
 
 from django.conf import settings as django_settings
-
 from metax_api.exceptions import Http503
 from metax_api.utils import ReferenceDataLoader
 
-import logging
 _logger = logging.getLogger(__name__)
 d = _logger.debug
 

src/metax_api/settings.py

@@ -12,6 +12,7 @@
 
 import logging.config
 import os
+
 import yaml
 from metax_api.utils import executing_test_case, executing_travis
 

src/metax_api/tests/api/base/apitests/authnz/authnz.py

@@ -1,6 +1,6 @@
+from metax_api.tests.utils import TestClassUtils
 from rest_framework import status
 from rest_framework.test import APITestCase
-from metax_api.tests.utils import TestClassUtils
 
 FORBIDDEN = status.HTTP_403_FORBIDDEN
 

src/metax_api/tests/api/base/apitests/catalog_records/read.py

@@ -1,9 +1,8 @@
 from django.core.management import call_command
-from rest_framework import status
-from rest_framework.test import APITestCase
-
 from metax_api.models import CatalogRecord
 from metax_api.tests.utils import test_data_file_path, TestClassUtils
+from rest_framework import status
+from rest_framework.test import APITestCase
 
 
 class CatalogRecordApiReadCommon(APITestCase, TestClassUtils):

src/metax_api/tests/api/base/apitests/contracts/contracts.py

@@ -1,9 +1,9 @@
 from django.core.management import call_command
+from metax_api.models import Contract, CatalogRecord
+from metax_api.tests.utils import test_data_file_path, TestClassUtils
 from rest_framework import status
 from rest_framework.test import APITestCase
 
-from metax_api.models import Contract, CatalogRecord
-from metax_api.tests.utils import test_data_file_path, TestClassUtils
 
 class ContractApiReadTestV1(APITestCase, TestClassUtils):
 

src/metax_api/tests/api/base/apitests/data_catalogs/read.py

@@ -1,8 +1,7 @@
-from rest_framework import status
-from rest_framework.test import APITestCase
 from django.core.management import call_command
-
 from metax_api.tests.utils import test_data_file_path, TestClassUtils
+from rest_framework import status
+from rest_framework.test import APITestCase
 
 
 class DataCatalogApiReadBasicTests(APITestCase, TestClassUtils):

src/metax_api/tests/api/base/apitests/data_catalogs/write.py

@@ -1,8 +1,7 @@
-from rest_framework import status
-from rest_framework.test import APITestCase
 from django.core.management import call_command
-
 from metax_api.tests.utils import test_data_file_path, TestClassUtils
+from rest_framework import status
+from rest_framework.test import APITestCase
 
 
 class DataCatalogApiWriteCommon(APITestCase, TestClassUtils):