Rearrange the imports to meet the style guide

This also includes `from __future__ import absolute_import`
in every file so that the imports are consistent in Python 2 and 3.
The Python 2 tests fail without this.

tests/__init__.py

@@ -1,25 +1,28 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import functools
-import os
+from __future__ import absolute_import
 from datetime import datetime, timedelta
-from mock import patch
-from six import string_types
-import time
+import functools
 import hashlib
+import os
+import time
 from traceback import extract_stack
-from module_build_service.common.utils import load_mmd, import_mmd
 
 import koji
+from mock import patch
+from six import string_types
+
 import module_build_service
-from module_build_service import db
+from module_build_service import db, Modulemd
 from module_build_service.builder.utils import get_rpm_release
-from module_build_service.common.utils import mmd_to_str, to_text_type
 from module_build_service.common.models import (
-    ModuleBuild, ModuleArch, ComponentBuild, VirtualStream,
     BUILD_STATES,
+    ComponentBuild,
+    ModuleArch,
+    ModuleBuild,
+    VirtualStream,
 )
-from module_build_service import Modulemd
+from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str, to_text_type
 from module_build_service.scheduler.db_session import db_session
 
 

tests/conftest.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import koji
-import os
-import pytest
-
+from __future__ import absolute_import
 from datetime import datetime
+import os
+
+import koji
 import mock
+import pytest
 
 import module_build_service
 from module_build_service.builder.utils import get_rpm_release
-from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.common.models import BUILD_STATES
+from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, read_staged_data, module_build_from_modulemd
 

tests/test_build/test_build.py

@@ -1,44 +1,43 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import sched
-import koji
+from __future__ import absolute_import
+from datetime import datetime, timedelta
+import hashlib
+import itertools
+import json
 import os
-import re
 from os import path, mkdir
 from os.path import dirname
-from shutil import copyfile
-from datetime import datetime, timedelta
+import re
+import sched
 from random import randint
-import hashlib
-import moksha.hub
+from shutil import copyfile
+
 import fedmsg
-
-from module_build_service.builder.utils import get_rpm_release
-from module_build_service.common import models
-from module_build_service.common.utils import load_mmd, import_mmd
-import module_build_service.scheduler.consumer
-import module_build_service.scheduler.handlers.repos
-from module_build_service.common.errors import Forbidden
-from module_build_service import app, conf, build_logs, log
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.scheduler import events
-from module_build_service.scheduler.handlers.tags import tagged as tagged_handler
-from module_build_service.scheduler.handlers.components import (
-    build_task_finalize as build_task_finalize_handler)
-from module_build_service.scheduler.handlers.repos import done as repos_done_handler
-
-from mock import patch, PropertyMock, Mock, MagicMock
-from werkzeug.datastructures import FileStorage
 import kobo
+import koji
+from mock import patch, PropertyMock, Mock, MagicMock
+import moksha.hub
 import pytest
+from werkzeug.datastructures import FileStorage
 
-import json
-import itertools
-
+from module_build_service import app, conf, build_logs, log
 from module_build_service.builder import GenericBuilder
-from module_build_service.builder.MockModuleBuilder import load_local_builds
-from module_build_service.builder.utils import validate_koji_tag
 from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
+from module_build_service.builder.MockModuleBuilder import load_local_builds
+from module_build_service.builder.utils import get_rpm_release, validate_koji_tag
+from module_build_service.common import models
+from module_build_service.common.errors import Forbidden
+from module_build_service.common.utils import load_mmd, import_mmd
+from module_build_service.scheduler import events
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.consumer
+from module_build_service.scheduler.handlers.components import (
+    build_task_finalize as build_task_finalize_handler
+)
+import module_build_service.scheduler.handlers.repos
+from module_build_service.scheduler.handlers.repos import done as repos_done_handler
+from module_build_service.scheduler.handlers.tags import tagged as tagged_handler
 from tests import clean_database, read_staged_data, staged_data_filename
 
 base_dir = dirname(dirname(__file__))

tests/test_builder/test_base.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
-
-import module_build_service.common.models
-import module_build_service.builder
-import module_build_service.resolver
-
-from tests import init_data
-
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.builder import GenericBuilder
 from mock import patch
 
+import module_build_service.builder
+from module_build_service.builder import GenericBuilder
+import module_build_service.common.models
+import module_build_service.resolver
+from module_build_service.scheduler.db_session import db_session
+from tests import init_data
+
 
 class TestGenericBuilder:
     def setup_method(self, test_method):

tests/test_builder/test_builder_utils.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import tempfile
+from __future__ import absolute_import
 import shutil
+import tempfile
 
 from mock import call, MagicMock, Mock, patch, PropertyMock
 import pytest
@@ -9,9 +10,9 @@ import pytest
 from module_build_service import conf
 from module_build_service.builder import utils
 from module_build_service.common import models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.errors import ProgrammingError, ValidationError
 from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
 from tests import init_data, read_staged_data, scheduler_init_data
 
 

tests/test_builder/test_content_generator.py

@@ -1,26 +1,24 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import io
-import pytest
 import json
-
 import os
 from os import path
 
+import kobo.rpmlib
+import koji
+from mock import patch, Mock, call, mock_open
+import pytest
+
 from module_build_service import conf, build_logs, Modulemd
+from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
 from module_build_service.common import models
 from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
 from module_build_service.scheduler.db_session import db_session
-
-from mock import patch, Mock, call, mock_open
-import kobo.rpmlib
-
 from tests import init_data
 from tests.test_web.test_views import FakeSCM
 
-import koji
-
-from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
 
 GET_USER_RV = {
     "id": 3686,

tests/test_builder/test_koji.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from collections import OrderedDict
 import os
 import shutil
@@ -10,14 +11,14 @@ import mock
 from mock import patch, MagicMock
 import pytest
 
-import module_build_service.scheduler.handlers.repos
-import module_build_service.common.models
 from module_build_service import conf, Modulemd
-from module_build_service.common.utils import mmd_to_str
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.builder import GenericBuilder
+from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
+import module_build_service.common.models
+from module_build_service.common.utils import mmd_to_str
 from module_build_service.scheduler import events
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.repos
 from tests import init_data, clean_database, make_module_in_db
 
 

tests/test_builder/test_mock.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 import tempfile
 import shutil
@@ -11,17 +12,17 @@ import mock
 import pytest
 
 from module_build_service import conf
-from module_build_service.common import models
-from module_build_service.common.utils import load_mmd, mmd_to_str
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.models import ModuleBuild, ComponentBuild
 from module_build_service.builder.MockModuleBuilder import (
     import_fake_base_module,
     import_builds_from_local_dnf_repos,
     load_local_builds,
     MockModuleBuilder,
 )
+from module_build_service.common import models
+from module_build_service.common.models import ModuleBuild, ComponentBuild
+from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.scheduler import events
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db, read_staged_data, staged_data_filename
 
 

tests/test_common/test_config.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os.path
 
 from module_build_service import conf

tests/test_common/test_koji.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
 
 from module_build_service.common.koji import get_session

tests/test_common/test_logger.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 from os import path
 import shutil
@@ -7,9 +8,9 @@ import tempfile
 
 from module_build_service import log
 from module_build_service.common import models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.logger import ModuleBuildLogs
 from module_build_service.scheduler.consumer import MBSConsumer
+from module_build_service.scheduler.db_session import db_session
 from tests import init_data
 
 

tests/test_common/test_messaging.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 
 from module_build_service.common import messaging
 from module_build_service.scheduler.parser import FedmsgMessageParser

tests/test_common/test_models/test_models.py

@@ -1,14 +1,21 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import pytest
+from __future__ import absolute_import
 
 from mock import patch
+import pytest
+
 from module_build_service import conf
 from module_build_service.common.models import ComponentBuild, ComponentBuildTrace, ModuleBuild
 from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.scheduler.db_session import db_session
-from tests import init_data as init_data_contexts, clean_database, read_staged_data
-from tests import make_module_in_db, module_build_from_modulemd
+from tests import (
+    clean_database,
+    init_data as init_data_contexts,
+    make_module_in_db,
+    module_build_from_modulemd,
+    read_staged_data,
+)
 
 
 @pytest.mark.usefixtures("model_tests_init_data")

tests/test_common/test_monitor.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 
+import mock
 import pytest
 import requests
-import mock
 from six.moves import reload_module
 
-import module_build_service.common.monitor
 from module_build_service import app, conf
 from module_build_service.common import models
+import module_build_service.common.monitor
 from module_build_service.scheduler.db_session import db_session
 from tests import init_data, make_module_in_db
 

tests/test_common/test_resolve.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 from mock import patch, PropertyMock
 import pytest
 
+from module_build_service import Modulemd
 from module_build_service.common import models
 from module_build_service.common.utils import load_mmd
 from module_build_service.common.resolve import get_base_module_mmds
-from module_build_service import Modulemd
 from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db, init_data, read_staged_data
 

tests/test_common/test_scm.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 import shutil
 import tempfile
 
 import pytest
 
-import module_build_service.common.scm
 from module_build_service.common.errors import ValidationError, UnprocessableEntity
+import module_build_service.common.scm
 
 base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, "scm_data"))
 repo_url = "file://" + base_dir + "/testrepo"

tests/test_common/test_submit.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
 
 from module_build_service.common.submit import _is_eol_in_pdc

tests/test_common/test_utils.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import pytest
 
 from module_build_service.common import models
+from module_build_service.common.errors import UnprocessableEntity
 from module_build_service.common.utils import import_mmd, load_mmd
 from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.errors import UnprocessableEntity
 from tests import clean_database, read_staged_data
 
 

tests/test_manage.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import pytest
+from __future__ import absolute_import
+
 from mock import patch
+import pytest
 
 from module_build_service import app
 from module_build_service.common import models
 from module_build_service.common.models import BUILD_STATES, ModuleBuild
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.manage import manager_wrapper, retire
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.web.utils import deps_to_dict
 from tests import clean_database, staged_data_filename
 

tests/test_resolver/test_db.py

@@ -1,19 +1,20 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 
 from datetime import datetime
 from mock import patch, PropertyMock
 import pytest
 
-import module_build_service.resolver as mbs_resolver
 from module_build_service import conf, Modulemd
+from module_build_service.builder.MockModuleBuilder import load_local_builds
 from module_build_service.common import models
 from module_build_service.common.errors import UnprocessableEntity
 from module_build_service.common.models import ModuleBuild
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
+import module_build_service.resolver as mbs_resolver
 from module_build_service.scheduler.db_session import db_session
-from module_build_service.builder.MockModuleBuilder import load_local_builds
 import tests
 
 

tests/test_resolver/test_koji.py

@@ -1,15 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import pytest
-from mock import patch, MagicMock
+from __future__ import absolute_import
 from datetime import datetime
 
+from mock import patch, MagicMock
+import pytest
+
 from module_build_service import conf
 from module_build_service.common.models import ModuleBuild, BUILD_STATES
 from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
 import module_build_service.resolver as mbs_resolver
-import tests
 from module_build_service.scheduler.db_session import db_session
+import tests
 
 
 @pytest.mark.usefixtures("reuse_component_init_data")

tests/test_resolver/test_local.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import pytest
+from __future__ import absolute_import
 from datetime import datetime
 
+import pytest
+
 from module_build_service import conf
-from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
-import module_build_service.resolver as mbs_resolver
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.models import ModuleBuild
+from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.resolver as mbs_resolver
 import tests
 
 

tests/test_resolver/test_mbs.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 from mock import patch, PropertyMock, Mock, call
 
 from module_build_service import app, conf
 from module_build_service.builder.MockModuleBuilder import load_local_builds
+import module_build_service.common.models
 from module_build_service.common.utils import load_mmd, mmd_to_str
 import module_build_service.resolver as mbs_resolver
 from module_build_service.scheduler.db_session import db_session
-import module_build_service.common.models
 import tests
 
 

tests/test_scheduler/test_batches.py

@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import koji
-from mock import patch
 import mock
+from mock import patch
 import pytest
 
 from module_build_service import conf
-from module_build_service.common import models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.builder import GenericBuilder
 from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
+from module_build_service.builder.utils import validate_koji_tag
+from module_build_service.common import models
 from module_build_service.scheduler import events
 from module_build_service.scheduler.batches import start_build_component, start_next_batch_build
-from module_build_service.builder.utils import validate_koji_tag
+from module_build_service.scheduler.db_session import db_session
 
 
 class DummyModuleBuilder(GenericBuilder):

tests/test_scheduler/test_celery_route_task.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
 
 from module_build_service import celery_app, conf
 from module_build_service.scheduler.handlers import components, greenwave, modules, repos, tags
 from module_build_service.scheduler.producer import fail_lost_builds
-
 from tests import scheduler_init_data
 
 

tests/test_scheduler/test_consumer.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 from mock import patch, MagicMock
+
 from module_build_service.scheduler import events
 from module_build_service.scheduler.consumer import MBSConsumer
 

tests/test_scheduler/test_default_modules.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from collections import namedtuple
 import errno
 
@@ -8,11 +9,11 @@ from mock import call, Mock, patch, PropertyMock
 import pytest
 
 from module_build_service import conf
-from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.errors import UnprocessableEntity
 from module_build_service.common.models import ModuleBuild
+from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
 from module_build_service.scheduler import default_modules
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db, read_staged_data
 
 

tests/test_scheduler/test_greenwave.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import json
 
 from mock import patch, Mock

tests/test_scheduler/test_greenwave_handler.py

@@ -1,17 +1,20 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import pytest
+from __future__ import absolute_import
 
 from mock import call, patch, PropertyMock, Mock
+import pytest
 from sqlalchemy import func
 
-import module_build_service.common.config
+
 from module_build_service import conf
-from module_build_service.scheduler.db_session import db_session
+import module_build_service.common.config
 from module_build_service.common.models import BUILD_STATES, ModuleBuild
 from module_build_service.scheduler.consumer import MBSConsumer
-from module_build_service.scheduler.handlers.greenwave import get_corresponding_module_build
-from module_build_service.scheduler.handlers.greenwave import decision_update
+from module_build_service.scheduler.db_session import db_session
+from module_build_service.scheduler.handlers.greenwave import (
+    decision_update, get_corresponding_module_build
+)
 from tests import clean_database, make_module_in_db
 
 

tests/test_scheduler/test_module_init.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 
 from mock import patch, PropertyMock
 
+from module_build_service import build_logs, conf
+from module_build_service.common.models import ModuleBuild
 from module_build_service.common.utils import load_mmd, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.modules
 from tests import clean_database, read_staged_data
 from tests.test_web.test_views import FakeSCM
-import module_build_service.scheduler.handlers.modules
-from module_build_service import build_logs, conf
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.models import ModuleBuild
 
 
 class TestModuleInit:

tests/test_scheduler/test_module_wait.py

@@ -1,16 +1,19 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+import os
+
+import koji
 import mock
 from mock import patch
-import module_build_service.scheduler.handlers.modules
-import os
-import koji
 import pytest
-from tests import scheduler_init_data
-import module_build_service.resolver
+
 from module_build_service import build_logs, conf, Modulemd
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.models import ComponentBuild, ModuleBuild
+import module_build_service.resolver
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.modules
+from tests import scheduler_init_data
 
 base_dir = os.path.dirname(os.path.dirname(__file__))
 

tests/test_scheduler/test_poller.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from datetime import datetime, timedelta
 import re
 
@@ -10,8 +11,8 @@ import pytest
 
 from module_build_service import conf
 from module_build_service.common import models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.scheduler import producer
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db
 
 

tests/test_scheduler/test_repo_done.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
 
-import module_build_service.scheduler.handlers.repos
 import module_build_service.common.models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.models import ComponentBuild
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.repos
 from tests import scheduler_init_data
 
 

tests/test_scheduler/test_reuse.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
 import pytest
 from sqlalchemy.orm.session import make_transient

tests/test_scheduler/test_submit.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from datetime import datetime
 
 import mock
 import pytest
 
-from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
-from module_build_service.scheduler.db_session import db_session
 from module_build_service import app, conf
 from module_build_service.common import models
 from module_build_service.common.errors import UnprocessableEntity
+from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
 import module_build_service.scheduler.handlers.components
 from module_build_service.scheduler.submit import (
     get_build_arches, format_mmd, record_component_builds, record_module_build_arches

tests/test_scheduler/test_tag_tagged.py

@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import mock
-import pytest
-
-from mock import patch
-
-import module_build_service.scheduler.handlers.repos
-import module_build_service.scheduler.handlers.tags
-import module_build_service.common.models
-
-from module_build_service.scheduler.db_session import db_session
+from __future__ import absolute_import
 
 import koji
+import mock
+from mock import patch
+import pytest
+
+import module_build_service.common.models
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.repos
+import module_build_service.scheduler.handlers.tags
 
 
 @pytest.mark.usefixtures("reuse_component_init_data")

tests/test_scheduler/test_ursine.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 from mock import patch, Mock
 
 from module_build_service import conf

tests/test_web/test_auth.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from os import path
 
-import pytest
-import requests
 import mock
 from mock import patch, PropertyMock, Mock
+import pytest
+import requests
 
-import module_build_service.web.auth
-import module_build_service.common.errors
-import module_build_service.common.config as mbs_config
 from module_build_service import app
+import module_build_service.common.config as mbs_config
+import module_build_service.common.errors
+import module_build_service.web.auth
 
 
 class TestAuthModule:

tests/test_web/test_mmd_resolver.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import collections
+
 import pytest
 import solv
 
-from module_build_service.web.mmd_resolver import MMDResolver
 from module_build_service import Modulemd
+from module_build_service.web.mmd_resolver import MMDResolver
 
 
 class TestMMDResolver:

tests/test_web/test_mse.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import pytest
 
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.errors import StreamAmbigous
+from module_build_service.scheduler.db_session import db_session
 from module_build_service.web.mse import (
     expand_mse_streams, generate_expanded_mmds, get_mmds_required_by_module_recursively
 )

tests/test_web/test_submit.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import io
 from os import path
 from shutil import rmtree
@@ -10,9 +11,9 @@ import pytest
 from werkzeug.datastructures import FileStorage
 
 from module_build_service.common import models
+from module_build_service.common.errors import ValidationError
 from module_build_service.common.utils import mmd_to_str
 from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.errors import ValidationError
 from module_build_service.web.submit import (
     get_prefixed_version, submit_module_build, submit_module_build_from_yaml
 )

tests/test_web/test_views.py

@@ -1,23 +1,30 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import json
 from datetime import datetime
 from functools import partial
-from sqlalchemy.orm import load_only
-
-from mock import patch, PropertyMock, Mock
-from shutil import copyfile
+import hashlib
 from os import path, mkdir
 from os.path import basename, dirname, splitext
-from requests.utils import quote
-import hashlib
-import koji
-import pytest
 import re
-import sqlalchemy
+from shutil import copyfile
 
+import koji
+from mock import patch, PropertyMock, Mock
+from requests.utils import quote
+import pytest
+import sqlalchemy
+from sqlalchemy.orm import load_only
+
+from module_build_service import app, version
 from module_build_service.builder.utils import get_rpm_release
+import module_build_service.common.config as mbs_config
+from module_build_service.common.errors import UnprocessableEntity
+from module_build_service.common.models import ModuleBuild, BUILD_STATES, ComponentBuild
 from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.web.submit
 from tests import (
     init_data,
     clean_database,
@@ -27,12 +34,6 @@ from tests import (
     time_assert,
 )
 from tests.test_common.test_scm import base_dir as scm_base_dir
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.errors import UnprocessableEntity
-from module_build_service.common.models import ModuleBuild, BUILD_STATES, ComponentBuild
-from module_build_service import app, version
-import module_build_service.common.config as mbs_config
-import module_build_service.web.submit
 
 
 user = ("Homer J. Simpson", {"packager"})