openstack/cinder
Code Issues Proposed changes

Merge "Fix flake8 warnings on flake8-import-order>0.19.0"

Browse Source
This commit is contained in:
Zuul
2025-07-18 11:12:54 +00:00
committed by Gerrit Code Review
parent 94c7ca0dad 781668f445
commit d6a14bbc76
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/api/api_utils.py
View File

@@ -23,12 +23,12 @@ from oslo_utils import strutils
import webob import webob
from webob import exc from webob import exc
if typing.TYPE_CHECKING:
# conditional import to avoid a circular import problem from cinderlib
from cinder import context
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
if typing.TYPE_CHECKING:
from cinder import context
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_group('keystone_authtoken', CONF.import_group('keystone_authtoken',
'keystonemiddleware.auth_token.__init__') 'keystonemiddleware.auth_token.__init__')

4
cinder/api/common.py
View File

@@ -28,11 +28,11 @@ import webob
from cinder.api import api_utils from cinder.api import api_utils
from cinder.api import microversions as mv from cinder.api import microversions as mv
from cinder.common import constants from cinder.common import constants
if typing.TYPE_CHECKING:
from cinder import context
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
if typing.TYPE_CHECKING:
from cinder import context
api_common_opts = [ api_common_opts = [
cfg.IntOpt('osapi_max_limit', cfg.IntOpt('osapi_max_limit',

4
cinder/cmd/backup.py
View File

@@ -44,8 +44,6 @@ from oslo_log import log as logging
from oslo_privsep import priv_context from oslo_privsep import priv_context
from oslo_reports import guru_meditation_report as gmr from oslo_reports import guru_meditation_report as gmr
from oslo_reports import opts as gmr_opts from oslo_reports import opts as gmr_opts
if typing.TYPE_CHECKING:
import oslo_service
# Need to register global_opts # Need to register global_opts
from cinder.common import config # noqa from cinder.common import config # noqa
@@ -57,6 +55,8 @@ from cinder import service
from cinder import utils from cinder import utils
from cinder import version from cinder import version
if typing.TYPE_CHECKING:
import oslo_service
CONF = cfg.CONF CONF = cfg.CONF

5
cinder/cmd/volume.py
View File

@@ -48,8 +48,6 @@ from oslo_log import log as logging
from oslo_privsep import priv_context from oslo_privsep import priv_context
from oslo_reports import guru_meditation_report as gmr from oslo_reports import guru_meditation_report as gmr
from oslo_reports import opts as gmr_opts from oslo_reports import opts as gmr_opts
if typing.TYPE_CHECKING:
import oslo_service
# Need to register global_opts # Need to register global_opts
from cinder.common import config # noqa from cinder.common import config # noqa
@@ -64,6 +62,9 @@ from cinder import service
from cinder import utils from cinder import utils
from cinder import version from cinder import version
if typing.TYPE_CHECKING:
import oslo_service
CONF = cfg.CONF CONF = cfg.CONF
host_opt = cfg.StrOpt('backend_host', help='Backend override of host value.') host_opt = cfg.StrOpt('backend_host', help='Backend override of host value.')