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.
This commit is contained in:
mprahl
2020-01-06 11:19:47 -05:00
parent 0c8227679c
commit 81f2bffdda
95 changed files with 411 additions and 279 deletions

View File

@@ -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:

View File

@@ -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:

View File

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

View File

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

View File

@@ -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"})