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 f1488967b2
commit af9505b0e1
95 changed files with 411 additions and 279 deletions

View File

@@ -1,13 +1,14 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import imp
import logging
import os
import pkg_resources
import re
import sys
import tempfile
import pkg_resources
from six import string_types
from module_build_service.common import logger

View File

@@ -1,6 +1,9 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
""" Defines custom exceptions and error handling functions """
from __future__ import absolute_import
from flask import jsonify

View File

@@ -19,6 +19,7 @@ logging.warning("%s failed to build", task_id)
"""
from __future__ import absolute_import
import os
import logging
import inspect

View File

@@ -2,11 +2,12 @@
# SPDX-License-Identifier: MIT
"""Generic messaging functions."""
from __future__ import absolute_import
import pkg_resources
from module_build_service.scheduler.parser import FedmsgMessageParser
from module_build_service import conf, log
from module_build_service.scheduler.parser import FedmsgMessageParser
def publish(topic, msg, conf, service):

View File

@@ -3,23 +3,24 @@
""" SQLAlchemy Database models for the Flask app
"""
import hashlib
import json
import koji
import re
from __future__ import absolute_import
from collections import OrderedDict, namedtuple
from datetime import datetime
import hashlib
import json
import re
import sqlalchemy
import kobo.rpmlib
import koji
import sqlalchemy
from sqlalchemy import func, and_
from sqlalchemy.orm import lazyload
from sqlalchemy.orm import validates, load_only
from module_build_service import db, log, get_url_for, conf
from module_build_service.common.errors import UnprocessableEntity
import module_build_service.common.messaging
from module_build_service.common.utils import load_mmd
from module_build_service.common.errors import UnprocessableEntity
from module_build_service.scheduler import events
DEFAULT_MODULE_CONTEXT = "00000000"

View File

@@ -3,7 +3,7 @@
# For an up-to-date version of this module, see:
# https://pagure.io/monitor-flask-sqlalchemy
from __future__ import absolute_import
import os
import tempfile

View File

@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import requests
from requests.packages.urllib3.util.retry import Retry

View File

@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
from module_build_service import conf
from module_build_service.common.errors import StreamAmbigous
from module_build_service.resolver import GenericResolver

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import functools
import time

View File

@@ -2,21 +2,22 @@
# SPDX-License-Identifier: MIT
"""SCM handler functions."""
from __future__ import absolute_import
import datetime
import os
import subprocess as sp
import re
import tempfile
import shutil
import datetime
import tempfile
from module_build_service import log, conf
from module_build_service.common.retry import retry
from module_build_service.common.errors import (
Forbidden,
ValidationError,
UnprocessableEntity,
ProgrammingError,
)
from module_build_service.common.retry import retry
def scm_url_schemes(terse=False):

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import shutil
import tempfile
@@ -7,8 +8,8 @@ import requests
import module_build_service.common.scm
from module_build_service import conf, log
from module_build_service.common.utils import load_mmd_file
from module_build_service.common.errors import ValidationError
from module_build_service.common.utils import load_mmd_file
def _is_eol_in_pdc(name, stream):

View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
from datetime import datetime
from functools import partial
import os