diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/ceph.py b/ceph/ceph-manager/ceph-manager/ceph_manager/ceph.py index a143b577..50e15993 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/ceph.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/ceph.py @@ -4,8 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 # -import exception -from i18n import _LI +from ceph_manager import exception +from ceph_manager.i18n import _LI # noinspection PyUnresolvedReferences from oslo_log import log as logging diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py b/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py index 6cfbba4f..359a7381 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/constants.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -from i18n import _ +from ceph_manager.i18n import _ # noinspection PyUnresolvedReferences from sysinv.common import constants as sysinv_constants diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py b/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py index 978fe752..a098a1dd 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/exception.py @@ -5,7 +5,8 @@ # # noinspection PyUnresolvedReferences -from i18n import _, _LW +from ceph_manager.i18n import _ +from ceph_manager.i18n import _LW # noinspection PyUnresolvedReferences from oslo_log import log as logging diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py b/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py index 2a13f88a..364ac96d 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/monitor.py @@ -14,10 +14,13 @@ from fm_api import constants as fm_constants from oslo_log import log as logging # noinspection PyProtectedMember -from i18n import _, _LI, _LW, _LE +from ceph_manager.i18n import _ +from ceph_manager.i18n import _LI +from ceph_manager.i18n import _LW +from ceph_manager.i18n import _LE -import constants -import exception +from ceph_manager import constants +from ceph_manager import exception LOG = logging.getLogger(__name__) diff --git a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py index 72edf406..18f21243 100644 --- a/ceph/ceph-manager/ceph-manager/ceph_manager/server.py +++ b/ceph/ceph-manager/ceph-manager/ceph_manager/server.py @@ -30,11 +30,12 @@ from oslo_service import loopingcall # noinspection PyUnresolvedReferences from cephclient import wrapper -from monitor import Monitor -import exception -import constants +from ceph_manager.monitor import Monitor +from ceph_manager import exception +from ceph_manager import constants -from i18n import _LI, _LW +from ceph_manager.i18n import _LI +from ceph_manager.i18n import _LW from retrying import retry eventlet.monkey_patch(all=True) diff --git a/tools/engtools/hostdata-collectors/scripts/live_stream.py b/tools/engtools/hostdata-collectors/scripts/live_stream.py index 7f7cbb05..05244e74 100644 --- a/tools/engtools/hostdata-collectors/scripts/live_stream.py +++ b/tools/engtools/hostdata-collectors/scripts/live_stream.py @@ -16,8 +16,10 @@ import logging from six.moves import configparser import itertools import six -from multiprocessing import Process, cpu_count -from subprocess import Popen, PIPE +from multiprocessing import Process +from multiprocessing import cpu_count +from subprocess import Popen +from subprocess import PIPE from collections import OrderedDict from six.moves import input diff --git a/utilities/logmgmt/logmgmt/logmgmt/logmgmt.py b/utilities/logmgmt/logmgmt/logmgmt/logmgmt.py index c8d787c8..6db2e05f 100644 --- a/utilities/logmgmt/logmgmt/logmgmt/logmgmt.py +++ b/utilities/logmgmt/logmgmt/logmgmt/logmgmt.py @@ -8,6 +8,7 @@ SPDX-License-Identifier: Apache-2.0 ################### # IMPORTS ################### +from __future__ import absolute_import import logging import logging.handlers import time @@ -19,7 +20,7 @@ import sys from daemon import runner -import prepostrotate +from logmgmt import prepostrotate ################### # CONSTANTS diff --git a/utilities/platform-util/platform-util/platform_util/license/license.py b/utilities/platform-util/platform-util/platform_util/license/license.py index 479ce0a0..4cb4aca5 100644 --- a/utilities/platform-util/platform-util/platform_util/license/license.py +++ b/utilities/platform-util/platform-util/platform_util/license/license.py @@ -3,14 +3,23 @@ # # SPDX-License-Identifier: Apache-2.0 # -from ctypes import cdll,util,c_bool,c_int,c_char_p,pointer,create_string_buffer +from ctypes import cdll +from ctypes import util +from ctypes import c_bool +from ctypes import c_int +from ctypes import c_char_p +from ctypes import pointer +from ctypes import create_string_buffer import logging import os -from platform_util.license import constants,exception +from platform_util.license import constants +from platform_util.license import exception import re import sys from sysinv.common import constants as sysinv_constants -from tsconfig.tsconfig import system_type,system_mode, SW_VERSION +from tsconfig.tsconfig import system_type +from tsconfig.tsconfig import system_mode +from tsconfig.tsconfig import SW_VERSION LOG = logging.getLogger(__name__)