openstack
/
nova
Code Issues Proposed changes

Use oslo.i18n 

oslo.i18n provides the i18n functions that were provided by
oslo-incubator's gettextutils module. Some tests that were
using internal details of the library were removed.

Change-Id: I44cfd5552e0dd86af21073419d31622f5fdb28e0
This commit is contained in:
Davanum Srinivas 2014-07-11 21:03:15 -04:00
parent ff756a0184
commit 826aed0ec7
296 changed files with 411 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/devref/il8n.rst
View File

@ -21,4 +21,4 @@ in nova/tests/test_localization.py.
The ``_()`` function is found by doing:: The ``_()`` function is found by doing::
from nova.openstack.common.gettextutils import _ from nova.i18n import _

2
nova/api/auth.py
View File

@ -21,7 +21,7 @@ import webob.dec
import webob.exc import webob.exc
from nova import context from nova import context
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common.middleware import request_id from nova.openstack.common.middleware import request_id

4
nova/api/ec2/__init__.py
View File

@ -32,8 +32,8 @@ from nova.api.ec2 import faults
from nova.api import validator from nova.api import validator
from nova import context from nova import context
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common.gettextutils import _LE from nova.i18n import _LE
from nova.openstack.common import importutils from nova.openstack.common import importutils
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/ec2/cloud.py
View File

@ -38,12 +38,12 @@ from nova.compute import api as compute_api
from nova.compute import vm_states from nova.compute import vm_states
from nova import db from nova import db
from nova import exception from nova import exception
from nova.i18n import _
from nova.image import s3 from nova.image import s3
from nova import network from nova import network
from nova.network.security_group import neutron_driver from nova.network.security_group import neutron_driver
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova import quota from nova import quota

2
nova/api/ec2/ec2utils.py
View File

@ -21,10 +21,10 @@ from nova import availability_zones
from nova import context from nova import context
from nova import db from nova import db
from nova import exception from nova import exception
from nova.i18n import _
from nova.network import model as network_model from nova.network import model as network_model
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache
from nova.openstack.common import timeutils from nova.openstack.common import timeutils

2
nova/api/metadata/handler.py
View File

@ -27,7 +27,7 @@ import webob.exc
from nova.api.metadata import base from nova.api.metadata import base
from nova import conductor from nova import conductor
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache
from nova import utils from nova import utils

2
nova/api/metadata/password.py
View File

@ -16,8 +16,8 @@
from webob import exc from webob import exc
from nova import context from nova import context
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova import utils from nova import utils

2
nova/api/metadata/vendordata_json.py
View File

@ -20,7 +20,7 @@ import errno
from oslo.config import cfg from oslo.config import cfg
from nova.api.metadata import base from nova.api.metadata import base
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

12
nova/api/openstack/__init__.py
View File

@ -27,9 +27,9 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import exception from nova import exception
from nova.i18n import _
from nova.i18n import translate
from nova import notifications from nova import notifications
from nova.openstack.common import gettextutils
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import utils from nova import utils
from nova import wsgi as base_wsgi from nova import wsgi as base_wsgi
@ -107,12 +107,8 @@ class FaultWrapper(base_wsgi.Middleware):
# inconsistent with the EC2 API to hide every exception, # inconsistent with the EC2 API to hide every exception,
# including those that are safe to expose, see bug 1021373 # including those that are safe to expose, see bug 1021373
if safe: if safe:
if isinstance(inner.msg_fmt, gettextutils.Message): user_locale = req.best_match_language()
user_locale = req.best_match_language() inner_msg = translate(inner.message, user_locale)
inner_msg = gettextutils.translate(
inner.msg_fmt, user_locale)
else:
inner_msg = unicode(inner)
outer.explanation = '%s: %s' % (inner.__class__.__name__, outer.explanation = '%s: %s' % (inner.__class__.__name__,
inner_msg) inner_msg)

2
nova/api/openstack/common.py
View File

@ -29,7 +29,7 @@ from nova.compute import task_states
from nova.compute import utils as compute_utils from nova.compute import utils as compute_utils
from nova.compute import vm_states from nova.compute import vm_states
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import quota from nova import quota

2
nova/api/openstack/compute/contrib/admin_actions.py
View File

@ -24,7 +24,7 @@ from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.compute import vm_states from nova.compute import vm_states
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils

2
nova/api/openstack/compute/contrib/aggregates.py
View File

@ -22,7 +22,7 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.compute import api as compute_api from nova.compute import api as compute_api
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/assisted_volume_snapshots.py
View File

@ -19,7 +19,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/contrib/attach_interfaces.py
View File

@ -21,8 +21,8 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/contrib/baremetal_nodes.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.virt.baremetal import db from nova.virt.baremetal import db
authorize = extensions.extension_authorizer('compute', 'baremetal_nodes') authorize = extensions.extension_authorizer('compute', 'baremetal_nodes')

2
nova/api/openstack/compute/contrib/cells.py
View File

@ -28,7 +28,7 @@ from nova.api.openstack import xmlutil
from nova.cells import rpcapi as cells_rpcapi from nova.cells import rpcapi as cells_rpcapi
from nova.compute import api as compute from nova.compute import api as compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova.openstack.common import timeutils from nova.openstack.common import timeutils

2
nova/api/openstack/compute/contrib/certificates.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
import nova.cert.rpcapi import nova.cert.rpcapi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'certificates') authorize = extensions.extension_authorizer('compute', 'certificates')

2
nova/api/openstack/compute/contrib/cloudpipe.py
View File

@ -25,9 +25,9 @@ from nova import compute
from nova.compute import utils as compute_utils from nova.compute import utils as compute_utils
from nova.compute import vm_states from nova.compute import vm_states
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common import fileutils from nova.openstack.common import fileutils
from nova.openstack.common.gettextutils import _
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/cloudpipe_update.py
View File

@ -17,8 +17,8 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
authorize = extensions.extension_authorizer('compute', 'cloudpipe_update') authorize = extensions.extension_authorizer('compute', 'cloudpipe_update')

2
nova/api/openstack/compute/contrib/console_auth_tokens.py
View File

@ -18,7 +18,7 @@ import webob
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'console_auth_tokens') authorize = extensions.extension_authorizer('compute', 'console_auth_tokens')

2
nova/api/openstack/compute/contrib/console_output.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'console_output') authorize = extensions.extension_authorizer('compute', 'console_output')

2
nova/api/openstack/compute/contrib/consoles.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'consoles') authorize = extensions.extension_authorizer('compute', 'consoles')

2
nova/api/openstack/compute/contrib/disk_config.py
View File

@ -19,7 +19,7 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import strutils from nova.openstack.common import strutils
ALIAS = 'OS-DCF' ALIAS = 'OS-DCF'

2
nova/api/openstack/compute/contrib/evacuate.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/fixed_ips.py
View File

@ -16,8 +16,8 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
authorize = extensions.extension_authorizer('compute', 'fixed_ips') authorize = extensions.extension_authorizer('compute', 'fixed_ips')

2
nova/api/openstack/compute/contrib/flavor_access.py
View File

@ -21,8 +21,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
soft_authorize = extensions.soft_extension_authorizer('compute', soft_authorize = extensions.soft_extension_authorizer('compute',

2
nova/api/openstack/compute/contrib/flavorextraspecs.py
View File

@ -22,8 +22,8 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova import utils from nova import utils
authorize = extensions.extension_authorizer('compute', 'flavorextraspecs') authorize = extensions.extension_authorizer('compute', 'flavorextraspecs')

2
nova/api/openstack/compute/contrib/flavormanage.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'flavormanage') authorize = extensions.extension_authorizer('compute', 'flavormanage')

2
nova/api/openstack/compute/contrib/floating_ip_dns.py
View File

@ -20,8 +20,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/floating_ips.py
View File

@ -24,8 +24,8 @@ from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova.compute import utils as compute_utils from nova.compute import utils as compute_utils
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/api/openstack/compute/contrib/floating_ips_bulk.py
View File

@ -18,8 +18,8 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
CONF = cfg.CONF CONF = cfg.CONF

2
nova/api/openstack/compute/contrib/fping.py
View File

@ -24,7 +24,7 @@ from nova.api.openstack import common
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import utils from nova import utils
authorize = extensions.extension_authorizer('compute', 'fping') authorize = extensions.extension_authorizer('compute', 'fping')

2
nova/api/openstack/compute/contrib/hosts.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/hypervisors.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'hypervisors') authorize = extensions.extension_authorizer('compute', 'hypervisors')

2
nova/api/openstack/compute/contrib/instance_usage_audit_log.py
View File

@ -21,7 +21,7 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import compute from nova import compute
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import utils from nova import utils
CONF = cfg.CONF CONF = cfg.CONF

2
nova/api/openstack/compute/contrib/keypairs.py
View File

@ -24,7 +24,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.compute import api as compute_api from nova.compute import api as compute_api
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
authorize = extensions.extension_authorizer('compute', 'keypairs') authorize = extensions.extension_authorizer('compute', 'keypairs')

2
nova/api/openstack/compute/contrib/multinic.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/contrib/networks_associate.py
View File

@ -15,8 +15,8 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/os_networks.py
View File

@ -21,8 +21,8 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/os_tenant_networks.py
View File

@ -22,8 +22,8 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import context as nova_context from nova import context as nova_context
from nova import exception from nova import exception
from nova.i18n import _
import nova.network import nova.network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import quota from nova import quota

2
nova/api/openstack/compute/contrib/quota_classes.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import xmlutil
import nova.context import nova.context
from nova import db from nova import db
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import quota from nova import quota
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/quotas.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil
import nova.context import nova.context
from nova import db from nova import db
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import quota from nova import quota

2
nova/api/openstack/compute/contrib/rescue.py
View File

@ -23,7 +23,7 @@ from nova.api.openstack import extensions as exts
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/scheduler_hints.py
View File

@ -16,7 +16,7 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
class SchedulerHintsController(wsgi.Controller): class SchedulerHintsController(wsgi.Controller):

2
nova/api/openstack/compute/contrib/security_group_default_rules.py
View File

@ -20,8 +20,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.i18n import _
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import xmlutils from nova.openstack.common import xmlutils

2
nova/api/openstack/compute/contrib/security_groups.py
View File

@ -29,9 +29,9 @@ from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova.compute import api as compute_api from nova.compute import api as compute_api
from nova import exception from nova import exception
from nova.i18n import _
from nova.network.security_group import neutron_driver from nova.network.security_group import neutron_driver
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import xmlutils from nova.openstack.common import xmlutils
from nova.virt import netutils from nova.virt import netutils

2
nova/api/openstack/compute/contrib/server_external_events.py
View File

@ -19,9 +19,9 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.objects import external_event as external_event_obj from nova.objects import external_event as external_event_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/contrib/server_groups.py
View File

@ -23,8 +23,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
import nova.exception import nova.exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova import utils from nova import utils
# NOTE(russellb) There is one other policy, 'legacy', but we don't allow that # NOTE(russellb) There is one other policy, 'legacy', but we don't allow that

2
nova/api/openstack/compute/contrib/server_start_stop.py
View File

@ -18,8 +18,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/contrib/services.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import servicegroup from nova import servicegroup
from nova import utils from nova import utils

2
nova/api/openstack/compute/contrib/shelve.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import extensions as exts
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
auth_shelve = exts.extension_authorizer('compute', 'shelve') auth_shelve = exts.extension_authorizer('compute', 'shelve')

2
nova/api/openstack/compute/contrib/simple_tenant_usage.py
View File

@ -23,9 +23,9 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.objects import instance as instance_obj from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
authorize_show = extensions.extension_authorizer('compute', authorize_show = extensions.extension_authorizer('compute',

2
nova/api/openstack/compute/contrib/volumes.py
View File

@ -24,8 +24,8 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/api/openstack/compute/extensions.py
View File

@ -16,7 +16,7 @@
from oslo.config import cfg from oslo.config import cfg
from nova.api.openstack import extensions as base_extensions from nova.api.openstack import extensions as base_extensions
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
ext_opts = [ ext_opts = [

2
nova/api/openstack/compute/flavors.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/image_metadata.py
View File

@ -18,8 +18,8 @@ from webob import exc
from nova.api.openstack import common from nova.api.openstack import common
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import exception from nova import exception
from nova.i18n import _
from nova.image import glance from nova.image import glance
from nova.openstack.common.gettextutils import _
class Controller(object): class Controller(object):

2
nova/api/openstack/compute/images.py
View File

@ -20,8 +20,8 @@ from nova.api.openstack.compute.views import images as views_images
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.i18n import _
import nova.image.glance import nova.image.glance
from nova.openstack.common.gettextutils import _
import nova.utils import nova.utils

2
nova/api/openstack/compute/ips.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import common
from nova.api.openstack.compute.views import addresses as view_addresses from nova.api.openstack.compute.views import addresses as view_addresses
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.openstack.common.gettextutils import _ from nova.i18n import _
def make_network(elem): def make_network(elem):

2
nova/api/openstack/compute/limits.py
View File

@ -44,7 +44,7 @@ import webob.exc
from nova.api.openstack.compute.views import limits as limits_views from nova.api.openstack.compute.views import limits as limits_views
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import importutils from nova.openstack.common import importutils
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova import quota from nova import quota

2
nova/api/openstack/compute/plugins/__init__.py
View File

@ -14,7 +14,7 @@
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/access_ips.py
View File

@ -16,7 +16,7 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/admin_actions.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.compute import vm_states from nova.compute import vm_states
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/admin_password.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-admin-password" ALIAS = "os-admin-password"

2
nova/api/openstack/compute/plugins/v3/aggregates.py
View File

@ -25,7 +25,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova.compute import api as compute_api from nova.compute import api as compute_api
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/attach_interfaces.py
View File

@ -24,8 +24,8 @@ from nova.api.openstack import extensions
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/plugins/v3/cells.py
View File

@ -27,7 +27,7 @@ from nova.api.openstack import wsgi
from nova.cells import rpcapi as cells_rpcapi from nova.cells import rpcapi as cells_rpcapi
from nova.compute import api as compute from nova.compute import api as compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova.openstack.common import timeutils from nova.openstack.common import timeutils

2
nova/api/openstack/compute/plugins/v3/certificates.py
View File

@ -18,8 +18,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
import nova.cert.rpcapi import nova.cert.rpcapi
from nova import exception from nova import exception
from nova.i18n import _
from nova import network from nova import network
from nova.openstack.common.gettextutils import _
ALIAS = "os-certificates" ALIAS = "os-certificates"
authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS) authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)

2
nova/api/openstack/compute/plugins/v3/console_auth_tokens.py
View File

@ -18,7 +18,7 @@ import webob
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-console-auth-tokens" ALIAS = "os-console-auth-tokens"
authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS) authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)

2
nova/api/openstack/compute/plugins/v3/console_output.py
View File

@ -23,7 +23,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-console-output" ALIAS = "os-console-output"
authorize = extensions.extension_authorizer('compute', "v3:" + ALIAS) authorize = extensions.extension_authorizer('compute', "v3:" + ALIAS)

2
nova/api/openstack/compute/plugins/v3/evacuate.py
View File

@ -23,7 +23,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/extended_volumes.py
View File

@ -23,8 +23,8 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import volume from nova import volume

2
nova/api/openstack/compute/plugins/v3/flavor_access.py
View File

@ -22,8 +22,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
ALIAS = 'flavor-access' ALIAS = 'flavor-access'
soft_authorize = extensions.soft_extension_authorizer('compute', soft_authorize = extensions.soft_extension_authorizer('compute',

2
nova/api/openstack/compute/plugins/v3/flavors.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
View File

@ -19,8 +19,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
class FlavorExtraSpecsController(object): class FlavorExtraSpecsController(object):

2
nova/api/openstack/compute/plugins/v3/hosts.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/hypervisors.py
View File

@ -20,7 +20,7 @@ import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-hypervisors" ALIAS = "os-hypervisors"

2
nova/api/openstack/compute/plugins/v3/ips.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import common
from nova.api.openstack.compute.views import addresses as views_addresses from nova.api.openstack.compute.views import addresses as views_addresses
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.openstack.common.gettextutils import _ from nova.i18n import _
class IPsController(wsgi.Controller): class IPsController(wsgi.Controller):

2
nova/api/openstack/compute/plugins/v3/keypairs.py
View File

@ -24,7 +24,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova.compute import api as compute_api from nova.compute import api as compute_api
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = 'keypairs' ALIAS = 'keypairs'

2
nova/api/openstack/compute/plugins/v3/multiple_create.py
View File

@ -17,7 +17,7 @@ from webob import exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/pause_server.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/quota_sets.py
View File

@ -23,7 +23,7 @@ from nova.api import validation
import nova.context import nova.context
from nova import db from nova import db
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import quota from nova import quota

2
nova/api/openstack/compute/plugins/v3/remote_consoles.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-remote-consoles" ALIAS = "os-remote-consoles"

2
nova/api/openstack/compute/plugins/v3/rescue.py
View File

@ -25,7 +25,7 @@ from nova.api.openstack import wsgi
from nova.api import validation from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/scheduler_hints.py
View File

@ -15,7 +15,7 @@
import webob.exc import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-scheduler-hints" ALIAS = "os-scheduler-hints"

2
nova/api/openstack/compute/plugins/v3/server_actions.py
View File

@ -19,7 +19,7 @@ from nova.api.openstack import common
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.openstack.common.gettextutils import _ from nova.i18n import _
ALIAS = "os-server-actions" ALIAS = "os-server-actions"
authorize_actions = extensions.extension_authorizer('compute', authorize_actions = extensions.extension_authorizer('compute',

2
nova/api/openstack/compute/plugins/v3/server_external_events.py
View File

@ -18,9 +18,9 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.objects import external_event as external_event_obj from nova.objects import external_event as external_event_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging

2
nova/api/openstack/compute/plugins/v3/server_metadata.py
View File

@ -20,7 +20,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
class ServerMetadataController(wsgi.Controller): class ServerMetadataController(wsgi.Controller):

2
nova/api/openstack/compute/plugins/v3/servers.py
View File

@ -31,9 +31,9 @@ from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.i18n import _
from nova.image import glance from nova.image import glance
from nova import objects from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova.openstack.common import timeutils from nova.openstack.common import timeutils

2
nova/api/openstack/compute/plugins/v3/services.py
View File

@ -19,7 +19,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import servicegroup from nova import servicegroup
from nova import utils from nova import utils

2
nova/api/openstack/compute/server_metadata.py
View File

@ -19,7 +19,7 @@ from nova.api.openstack import common
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
class Controller(object): class Controller(object):

2
nova/api/openstack/compute/servers.py
View File

@ -33,9 +33,9 @@ from nova import block_device
from nova import compute from nova import compute
from nova.compute import flavors from nova.compute import flavors
from nova import exception from nova import exception
from nova.i18n import _
from nova import objects from nova import objects
from nova.objects import instance as instance_obj from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova.openstack.common import timeutils from nova.openstack.common import timeutils

2
nova/api/openstack/compute/views/servers.py
View File

@ -21,8 +21,8 @@ from nova.api.openstack.compute.views import addresses as views_addresses
from nova.api.openstack.compute.views import flavors as views_flavors from nova.api.openstack.compute.views import flavors as views_flavors
from nova.api.openstack.compute.views import images as views_images from nova.api.openstack.compute.views import images as views_images
from nova.compute import flavors from nova.compute import flavors
from nova.i18n import _
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova import utils from nova import utils

2
nova/api/openstack/extensions.py
View File

@ -26,7 +26,7 @@ import nova.api.openstack
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import importutils from nova.openstack.common import importutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
import nova.policy import nova.policy

17
nova/api/openstack/wsgi.py
View File

@ -25,8 +25,8 @@ import webob
from nova.api.openstack import xmlutil from nova.api.openstack import xmlutil
from nova import exception from nova import exception
from nova.openstack.common import gettextutils from nova import i18n
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import jsonutils from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova import utils from nova import utils
@ -193,7 +193,7 @@ class Request(webob.Request):
if not self.accept_language: if not self.accept_language:
return None return None
return self.accept_language.best_match( return self.accept_language.best_match(
gettextutils.get_available_languages('nova')) i18n.get_available_languages())
class ActionDispatcher(object): class ActionDispatcher(object):
@ -1197,8 +1197,7 @@ class Fault(webob.exc.HTTPException):
LOG.debug("Returning %(code)s to user: %(explanation)s", LOG.debug("Returning %(code)s to user: %(explanation)s",
{'code': code, 'explanation': explanation}) {'code': code, 'explanation': explanation})
explanation = gettextutils.translate(explanation, explanation = i18n.translate(explanation, user_locale)
user_locale)
fault_data = { fault_data = {
fault_name: { fault_name: {
'code': code, 'code': code,
@ -1261,13 +1260,9 @@ class RateLimitFault(webob.exc.HTTPException):
metadata = {"attributes": {"overLimit": ["code", "retryAfter"]}} metadata = {"attributes": {"overLimit": ["code", "retryAfter"]}}
self.content['overLimit']['message'] = \ self.content['overLimit']['message'] = \
gettextutils.translate( i18n.translate(self.content['overLimit']['message'], user_locale)
self.content['overLimit']['message'],
user_locale)
self.content['overLimit']['details'] = \ self.content['overLimit']['details'] = \
gettextutils.translate( i18n.translate(self.content['overLimit']['details'], user_locale)
self.content['overLimit']['details'],
user_locale)
xml_serializer = XMLDictSerializer(metadata, XMLNS_V11) xml_serializer = XMLDictSerializer(metadata, XMLNS_V11)
serializer = { serializer = {

2
nova/api/openstack/xmlutil.py
View File

@ -23,7 +23,7 @@ from lxml import etree
import six import six
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import utils from nova import utils

2
nova/api/sizelimit.py
View File

@ -20,7 +20,7 @@ from oslo.config import cfg
import webob.dec import webob.dec
import webob.exc import webob.exc
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova import wsgi from nova import wsgi

2
nova/api/validation/validators.py
View File

@ -19,7 +19,7 @@ Internal implementation of request Body validating middleware.
import jsonschema import jsonschema
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/block_device.py
View File

@ -18,7 +18,7 @@ import re
from oslo.config import cfg from oslo.config import cfg
from nova import exception from nova import exception
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import strutils from nova.openstack.common import strutils
from nova import utils from nova import utils

2
nova/cells/filters/target_cell.py
View File

@ -22,7 +22,7 @@ done as there's no way to know whether the full path is a valid.
""" """
from nova.cells import filters from nova.cells import filters
from nova.openstack.common.gettextutils import _ from nova.i18n import _
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/cells/manager.py
View File

@ -27,10 +27,10 @@ from nova.cells import state as cells_state
from nova.cells import utils as cells_utils from nova.cells import utils as cells_utils
from nova import context from nova import context
from nova import exception from nova import exception
from nova.i18n import _
from nova import manager from nova import manager
from nova import objects from nova import objects
from nova.objects import base as base_obj from nova.objects import base as base_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import importutils from nova.openstack.common import importutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import periodic_task from nova.openstack.common import periodic_task

Some files were not shown because too many files have changed in this diff Show More