openstack/nova
Code Issues Proposed changes

Remove usage of locals() for formatting from nova.api.*

Browse Source 
Using of locals() for formatting string is a nasty thing because:
1) It is not so clear as using explicit dicts
2) It could produce hidden errors during refactoring
3) Changing name of variable causes change in message
4) Creating a lot of unused variables

fixes bug 1171936
Change-Id: I293d7ebb875f65cce322d4938d1ae323f3aded8d
This commit is contained in:
Boris Pavlovic
2013-05-17 17:38:51 +04:00
parent f124d50024
commit 2dce8c92f6
17 changed files with 109 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ext/nova_todo.py
View File

@@ -37,13 +37,13 @@ def process_todo_nodes(app, doctree, fromdocname):
for todo_info in env.todo_all_todos: for todo_info in env.todo_all_todos:
para = nodes.paragraph() para = nodes.paragraph()
filename = env.doc2path(todo_info['docname'], base=None)
# Create a reference # Create a reference
newnode = nodes.reference('', '') newnode = nodes.reference('', '')
line_info = todo_info['lineno'] filename = env.doc2path(todo_info['docname'], base=None)
link = _('%(filename)s, line %(line_info)d') % locals() link = (_('%(filename)s, line %(line_info)d') %
{'filename': filename, 'line_info': todo_info['lineno']})
innernode = nodes.emphasis(link, link) innernode = nodes.emphasis(link, link)
newnode['refdocname'] = todo_info['docname'] newnode['refdocname'] = todo_info['docname']

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

@@ -9,14 +9,11 @@ in a ``_()`` function call. For example::
LOG.debug(_("block_device_mapping %s"), block_device_mapping) LOG.debug(_("block_device_mapping %s"), block_device_mapping)
If you have multiple arguments, the convention is to use named parameters. Do not use ``locals()`` for formatting messages because:
It's common to use the ``locals()`` dict (which contains the names and values 1. It is not as clear as using explicit dicts.
of the local variables in the current scope) to do the string interpolation. 2. It could produce hidden errors during refactoring.
For example:: 3. Changing the name of a variable causes a change in the message.
4. It creates a lot of otherwise unused variables.
label = ...
sr_ref = ...
LOG.debug(_('Introduced %(label)s as %(sr_ref)s.') % locals())
If you do not follow the project conventions, your code may cause the If you do not follow the project conventions, your code may cause the
LocalizationTestCase.test_multiple_positional_format_placeholders test to fail LocalizationTestCase.test_multiple_positional_format_placeholders test to fail

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

@@ -78,7 +78,7 @@ CONF.import_opt('use_forwarded_for', 'nova.api.auth')
def ec2_error(req, request_id, code, message): def ec2_error(req, request_id, code, message):
"""Helper to send an ec2_compatible error.""" """Helper to send an ec2_compatible error."""
LOG.error(_('%(code)s: %(message)s') % locals()) LOG.error(_('%(code)s: %(message)s'), {'code': code, 'message': message})
resp = webob.Response() resp = webob.Response()
resp.status = 400 resp.status = 400
resp.headers['Content-Type'] = 'text/xml' resp.headers['Content-Type'] = 'text/xml'
@@ -180,11 +180,12 @@ class Lockout(wsgi.Middleware):
# NOTE(vish): To use incr, failures has to be a string. # NOTE(vish): To use incr, failures has to be a string.
self.mc.set(failures_key, '1', time=CONF.lockout_window * 60) self.mc.set(failures_key, '1', time=CONF.lockout_window * 60)
elif failures >= CONF.lockout_attempts: elif failures >= CONF.lockout_attempts:
lock_mins = CONF.lockout_minutes LOG.warn(_('Access key %(access_key)s has had %(failures)d '
msg = _('Access key %(access_key)s has had %(failures)d' 'failed authentications and will be locked out '
' failed authentications and will be locked out' 'for %(lock_mins)d minutes.'),
' for %(lock_mins)d minutes.') % locals() {'access_key': access_key,
LOG.warn(msg) 'failures': failures,
'lock_mins': CONF.lockout_minutes})
self.mc.set(failures_key, str(failures), self.mc.set(failures_key, str(failures),
time=CONF.lockout_minutes * 60) time=CONF.lockout_minutes * 60)
return res return res
@@ -333,7 +334,8 @@ class Requestify(wsgi.Middleware):
LOG.debug(_('action: %s'), action) LOG.debug(_('action: %s'), action)
for key, value in args.items(): for key, value in args.items():
LOG.debug(_('arg: %(key)s\t\tval: %(value)s') % locals()) LOG.debug(_('arg: %(key)s\t\tval: %(value)s'),
{'key': key, 'value': value})
# Success! # Success!
api_request = apirequest.APIRequest(self.controller, action, api_request = apirequest.APIRequest(self.controller, action,
@@ -409,7 +411,9 @@ class Authorizer(wsgi.Middleware):
return self.application return self.application
else: else:
LOG.audit(_('Unauthorized request for controller=%(controller)s ' LOG.audit(_('Unauthorized request for controller=%(controller)s '
'and action=%(action)s') % locals(), context=context) 'and action=%(action)s'),
{'controller': controller, 'action': action},
context=context)
raise webob.exc.HTTPUnauthorized() raise webob.exc.HTTPUnauthorized()
def _matches_any_role(self, context, roles): def _matches_any_role(self, context, roles):

9
nova/api/ec2/apirequest.py
View File

@@ -57,11 +57,10 @@ class APIRequest(object):
method = getattr(self.controller, method = getattr(self.controller,
ec2utils.camelcase_to_underscore(self.action)) ec2utils.camelcase_to_underscore(self.action))
except AttributeError: except AttributeError:
controller = self.controller LOG.exception(_('Unsupported API request: controller = '
action = self.action '%(controller)s, action = %(action)s'),
_error = _('Unsupported API request: controller = %(controller)s,' {'controller': self.controller,
' action = %(action)s') % locals() 'action': self.action})
LOG.exception(_error)
# TODO(gundlach): Raise custom exception, trap in apiserver, # TODO(gundlach): Raise custom exception, trap in apiserver,
# and reraise as 400 error. # and reraise as 400 error.
raise exception.InvalidRequest() raise exception.InvalidRequest()

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

@@ -621,8 +621,7 @@ class CloudController(object):
validprotocols = ['tcp', 'udp', 'icmp', '6', '17', '1'] validprotocols = ['tcp', 'udp', 'icmp', '6', '17', '1']
if 'ip_protocol' in values and \ if 'ip_protocol' in values and \
values['ip_protocol'] not in validprotocols: values['ip_protocol'] not in validprotocols:
protocol = values['ip_protocol'] err = _('Invalid IP protocol %s.') % values['ip_protocol']
err = _("Invalid IP protocol %(protocol)s.") % locals()
raise exception.EC2APIError(message=err, code="400") raise exception.EC2APIError(message=err, code="400")
def revoke_security_group_ingress(self, context, group_name=None, def revoke_security_group_ingress(self, context, group_name=None,
@@ -876,9 +875,12 @@ class CloudController(object):
volume_id = ec2utils.ec2_vol_id_to_uuid(volume_id) volume_id = ec2utils.ec2_vol_id_to_uuid(volume_id)
instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id) instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id)
instance = self.compute_api.get(context, instance_uuid) instance = self.compute_api.get(context, instance_uuid)
msg = _("Attach volume %(volume_id)s to instance %(instance_id)s" LOG.audit(_('Attach volume %(volume_id)s to instance %(instance_id)s '
" at %(device)s") % locals() 'at %(device)s'),
LOG.audit(msg, context=context) {'volume_id': volume_id,
'instance_id': instance_id,
'device': device},
context=context)
try: try:
self.compute_api.attach_volume(context, instance, self.compute_api.attach_volume(context, instance,
@@ -1238,7 +1240,7 @@ class CloudController(object):
return {'publicIp': public_ip} return {'publicIp': public_ip}
def release_address(self, context, public_ip, **kwargs): def release_address(self, context, public_ip, **kwargs):
LOG.audit(_("Release address %s"), public_ip, context=context) LOG.audit(_('Release address %s'), public_ip, context=context)
try: try:
self.network_api.release_floating_ip(context, address=public_ip) self.network_api.release_floating_ip(context, address=public_ip)
return {'return': "true"} return {'return': "true"}
@@ -1246,8 +1248,10 @@ class CloudController(object):
raise exception.EC2APIError(_('Unable to release IP Address.')) raise exception.EC2APIError(_('Unable to release IP Address.'))
def associate_address(self, context, instance_id, public_ip, **kwargs): def associate_address(self, context, instance_id, public_ip, **kwargs):
LOG.audit(_("Associate address %(public_ip)s to" LOG.audit(_("Associate address %(public_ip)s to instance "
" instance %(instance_id)s") % locals(), context=context) "%(instance_id)s"),
{'public_ip': public_ip, 'instance_id': instance_id},
context=context)
instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id) instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, instance_id)
instance = self.compute_api.get(context, instance_uuid) instance = self.compute_api.get(context, instance_uuid)
@@ -1506,9 +1510,10 @@ class CloudController(object):
metadata['properties']['block_device_mapping'] = mappings metadata['properties']['block_device_mapping'] = mappings
image_id = self._register_image(context, metadata) image_id = self._register_image(context, metadata)
msg = _("Registered image %(image_location)s with" LOG.audit(_('Registered image %(image_location)s with id '
" id %(image_id)s") % locals() '%(image_id)s'),
LOG.audit(msg, context=context) {'image_location': image_location, 'image_id': image_id},
context=context)
return {'imageId': image_id} return {'imageId': image_id}
def describe_image_attribute(self, context, image_id, attribute, **kwargs): def describe_image_attribute(self, context, image_id, attribute, **kwargs):
@@ -1615,10 +1620,10 @@ class CloudController(object):
# CreateImage only supported for the analogue of EBS-backed instances # CreateImage only supported for the analogue of EBS-backed instances
if not self.compute_api.is_volume_backed_instance(context, instance, if not self.compute_api.is_volume_backed_instance(context, instance,
bdms): bdms):
root = instance['root_device_name']
msg = _("Invalid value '%(ec2_instance_id)s' for instanceId. " msg = _("Invalid value '%(ec2_instance_id)s' for instanceId. "
"Instance does not have a volume attached at root " "Instance does not have a volume attached at root "
"(%(root)s)") % locals() "(%(root)s)") % {'root': instance['root_device_name'],
'ec2_instance_id': ec2_instance_id}
raise exception.InvalidParameterValue(err=msg) raise exception.InvalidParameterValue(err=msg)
# stop the instance if necessary # stop the instance if necessary

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

@@ -166,10 +166,14 @@ class MetadataRequestHandler(wsgi.Application):
if expected_signature != signature: if expected_signature != signature:
if instance_id: if instance_id:
w = _('X-Instance-ID-Signature: %(signature)s does not match ' LOG.warn(_('X-Instance-ID-Signature: %(signature)s does not '
'the expected value: %(expected_signature)s for id: ' 'match the expected value: %(expected_signature)s '
'%(instance_id)s. Request From: %(remote_address)s') 'for id: %(instance_id)s. Request From: '
LOG.warn(w % locals()) '%(remote_address)s'),
{'signature': signature,
'expected_signature': expected_signature,
'instance_id': instance_id,
'remote_address': remote_address})
msg = _('Invalid proxy request signature.') msg = _('Invalid proxy request signature.')
raise webob.exc.HTTPForbidden(explanation=msg) raise webob.exc.HTTPForbidden(explanation=msg)

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

@@ -174,18 +174,20 @@ class APIRouter(base_wsgi.Router):
def _setup_extensions(self, ext_mgr): def _setup_extensions(self, ext_mgr):
for extension in ext_mgr.get_controller_extensions(): for extension in ext_mgr.get_controller_extensions():
ext_name = extension.extension.name
collection = extension.collection collection = extension.collection
controller = extension.controller controller = extension.controller
msg_format_dict = {'collection': collection,
'ext_name': extension.extension.name}
if collection not in self.resources: if collection not in self.resources:
LOG.warning(_('Extension %(ext_name)s: Cannot extend ' LOG.warning(_('Extension %(ext_name)s: Cannot extend '
'resource %(collection)s: No such resource') % 'resource %(collection)s: No such resource'),
locals()) msg_format_dict)
continue continue
LOG.debug(_('Extension %(ext_name)s extending resource: ' LOG.debug(_('Extension %(ext_name)s extending resource: '
'%(collection)s') % locals()) '%(collection)s'),
msg_format_dict)
resource = self.resources[collection] resource = self.resources[collection]
resource.register_actions(controller) resource.register_actions(controller)

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

@@ -113,7 +113,8 @@ def status_from_state(vm_state, task_state='default'):
if status == "UNKNOWN": if status == "UNKNOWN":
LOG.error(_("status is UNKNOWN from vm_state=%(vm_state)s " LOG.error(_("status is UNKNOWN from vm_state=%(vm_state)s "
"task_state=%(task_state)s. Bad upgrade or db " "task_state=%(task_state)s. Bad upgrade or db "
"corrupted?") % locals()) "corrupted?"),
{'vm_state': vm_state, 'task_state': task_state})
return status return status
@@ -358,11 +359,12 @@ def raise_http_conflict_for_instance_invalid_state(exc, action):
attr = exc.kwargs.get('attr') attr = exc.kwargs.get('attr')
state = exc.kwargs.get('state') state = exc.kwargs.get('state')
if attr and state: if attr and state:
msg = _("Cannot '%(action)s' while instance is in %(attr)s %(state)s") msg = _("Cannot '%(action)s' while instance is in %(attr)s "
"%(state)s") % {'action': action, 'attr': attr, 'state': state}
else: else:
# At least give some meaningful message # At least give some meaningful message
msg = _("Instance is in an invalid state for '%(action)s'") msg = _("Instance is in an invalid state for '%s'") % action
raise webob.exc.HTTPConflict(explanation=msg % locals()) raise webob.exc.HTTPConflict(explanation=msg)
class MetadataDeserializer(wsgi.MetadataXMLDeserializer): class MetadataDeserializer(wsgi.MetadataXMLDeserializer):

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

@@ -289,11 +289,11 @@ class AdminActionsController(wsgi.Controller):
raise exc.HTTPBadRequest(explanation=ex.format_message()) raise exc.HTTPBadRequest(explanation=ex.format_message())
except Exception: except Exception:
if host is None: if host is None:
msg = _("Live migration of instance %(id)s to another host" msg = _("Live migration of instance %s to another host "
" failed") % locals() "failed") % id
else: else:
msg = _("Live migration of instance %(id)s to host %(host)s" msg = _("Live migration of instance %(id)s to host %(host)s "
" failed") % locals() "failed") % {'id': id, 'host': host}
LOG.exception(msg) LOG.exception(msg)
# Return messages from scheduler # Return messages from scheduler
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPBadRequest(explanation=msg)

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

@@ -86,7 +86,7 @@ class AggregateController(object):
try: try:
aggregate = self.api.get_aggregate(context, id) aggregate = self.api.get_aggregate(context, id)
except exception.AggregateNotFound: except exception.AggregateNotFound:
LOG.info(_("Cannot show aggregate: %(id)s") % locals()) LOG.info(_("Cannot show aggregate: %s"), id)
raise exc.HTTPNotFound raise exc.HTTPNotFound
return self._marshall_aggregate(aggregate) return self._marshall_aggregate(aggregate)
@@ -112,7 +112,7 @@ class AggregateController(object):
try: try:
aggregate = self.api.update_aggregate(context, id, updates) aggregate = self.api.update_aggregate(context, id, updates)
except exception.AggregateNotFound: except exception.AggregateNotFound:
LOG.info(_("Cannot update aggregate: %(id)s") % locals()) LOG.info(_('Cannot update aggregate: %s'), id)
raise exc.HTTPNotFound raise exc.HTTPNotFound
return self._marshall_aggregate(aggregate) return self._marshall_aggregate(aggregate)
@@ -124,7 +124,7 @@ class AggregateController(object):
try: try:
self.api.delete_aggregate(context, id) self.api.delete_aggregate(context, id)
except exception.AggregateNotFound: except exception.AggregateNotFound:
LOG.info(_("Cannot delete aggregate: %(id)s") % locals()) LOG.info(_('Cannot delete aggregate: %s'), id)
raise exc.HTTPNotFound raise exc.HTTPNotFound
def action(self, req, id, body): def action(self, req, id, body):
@@ -137,7 +137,7 @@ class AggregateController(object):
try: try:
return _actions[action](req, id, data) return _actions[action](req, id, data)
except KeyError: except KeyError:
msg = _("Aggregates does not have %s action") % action msg = _('Aggregates does not have %s action') % action
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPBadRequest(explanation=msg)
raise exc.HTTPBadRequest(explanation=_("Invalid request body")) raise exc.HTTPBadRequest(explanation=_("Invalid request body"))
@@ -150,13 +150,13 @@ class AggregateController(object):
try: try:
aggregate = self.api.add_host_to_aggregate(context, id, host) aggregate = self.api.add_host_to_aggregate(context, id, host)
except (exception.AggregateNotFound, exception.ComputeHostNotFound): except (exception.AggregateNotFound, exception.ComputeHostNotFound):
LOG.info(_("Cannot add host %(host)s in aggregate " LOG.info(_('Cannot add host %(host)s in aggregate %(id)s'),
"%(id)s") % locals()) {'host': host, 'id': id})
raise exc.HTTPNotFound raise exc.HTTPNotFound
except (exception.AggregateHostExists, except (exception.AggregateHostExists,
exception.InvalidAggregateAction): exception.InvalidAggregateAction):
LOG.info(_("Cannot add host %(host)s in aggregate " LOG.info(_('Cannot add host %(host)s in aggregate %(id)s'),
"%(id)s") % locals()) {'host': host, 'id': id})
raise exc.HTTPConflict raise exc.HTTPConflict
return self._marshall_aggregate(aggregate) return self._marshall_aggregate(aggregate)
@@ -169,12 +169,12 @@ class AggregateController(object):
aggregate = self.api.remove_host_from_aggregate(context, id, host) aggregate = self.api.remove_host_from_aggregate(context, id, host)
except (exception.AggregateNotFound, exception.AggregateHostNotFound, except (exception.AggregateNotFound, exception.AggregateHostNotFound,
exception.ComputeHostNotFound): exception.ComputeHostNotFound):
LOG.info(_("Cannot remove host %(host)s in aggregate " LOG.info(_('Cannot remove host %(host)s in aggregate %(id)s'),
"%(id)s") % locals()) {'host': host, 'id': id})
raise exc.HTTPNotFound raise exc.HTTPNotFound
except exception.InvalidAggregateAction: except exception.InvalidAggregateAction:
LOG.info(_("Cannot remove host %(host)s in aggregate " LOG.info(_('Cannot remove host %(host)s in aggregate %(id)s'),
"%(id)s") % locals()) {'host': host, 'id': id})
raise exc.HTTPConflict raise exc.HTTPConflict
return self._marshall_aggregate(aggregate) return self._marshall_aggregate(aggregate)
@@ -193,8 +193,8 @@ class AggregateController(object):
aggregate = self.api.update_aggregate_metadata(context, aggregate = self.api.update_aggregate_metadata(context,
id, metadata) id, metadata)
except exception.AggregateNotFound: except exception.AggregateNotFound:
LOG.info(_("Cannot set metadata %(metadata)s in aggregate " LOG.info(_('Cannot set metadata %(metadata)s in aggregate %(id)s'),
"%(id)s") % locals()) {'metadata': metadata, 'id': id})
raise exc.HTTPNotFound raise exc.HTTPNotFound
return self._marshall_aggregate(aggregate) return self._marshall_aggregate(aggregate)

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

@@ -309,7 +309,7 @@ class FloatingIPActionController(wsgi.Controller):
return webob.Response(status_int=202) return webob.Response(status_int=202)
else: else:
msg = _("Floating ip %(address)s is not associated with instance " msg = _("Floating ip %(address)s is not associated with instance "
"%(id)s.") % locals() "%(id)s.") % {'address': address, 'id': id}
raise webob.exc.HTTPUnprocessableEntity(explanation=msg) raise webob.exc.HTTPUnprocessableEntity(explanation=msg)

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

@@ -202,8 +202,9 @@ class HostController(object):
def _set_host_maintenance(self, context, host_name, mode=True): def _set_host_maintenance(self, context, host_name, mode=True):
"""Start/Stop host maintenance window. On start, it triggers """Start/Stop host maintenance window. On start, it triggers
guest VMs evacuation.""" guest VMs evacuation."""
LOG.audit(_("Putting host %(host_name)s in maintenance " LOG.audit(_("Putting host %(host_name)s in maintenance mode "
"mode %(mode)s.") % locals()) "%(mode)s."),
{'host_name': host_name, 'mode': mode})
try: try:
result = self.api.set_host_maintenance(context, host_name, mode) result = self.api.set_host_maintenance(context, host_name, mode)
except NotImplementedError: except NotImplementedError:

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

@@ -397,9 +397,12 @@ class VolumeAttachmentController(wsgi.Controller):
self._validate_volume_id(volume_id) self._validate_volume_id(volume_id)
msg = _("Attach volume %(volume_id)s to instance %(server_id)s" LOG.audit(_("Attach volume %(volume_id)s to instance %(server_id)s "
" at %(device)s") % locals() "at %(device)s"),
LOG.audit(msg, context=context) {'volume_id': volume_id,
'device': device,
'server_id': server_id},
context=context)
try: try:
instance = self.compute_api.get(context, server_id) instance = self.compute_api.get(context, server_id)

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

@@ -1404,9 +1404,8 @@ def remove_invalid_options(context, search_options, allowed_search_options):
return return
# Otherwise, strip out all unknown options # Otherwise, strip out all unknown options
unknown_options = [opt for opt in search_options unknown_options = [opt for opt in search_options
if opt not in allowed_search_options] if opt not in allowed_search_options]
unk_opt_str = ", ".join(unknown_options) LOG.debug(_("Removing options '%s' from query"),
log_msg = _("Removing options '%(unk_opt_str)s' from query") % locals() ", ".join(unknown_options))
LOG.debug(log_msg)
for opt in unknown_options: for opt in unknown_options:
search_options.pop(opt, None) search_options.pop(opt, None)

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

@@ -275,7 +275,8 @@ class ExtensionManager(object):
self.load_extension(ext_factory) self.load_extension(ext_factory)
except Exception as exc: except Exception as exc:
LOG.warn(_('Failed to load extension %(ext_factory)s: ' LOG.warn(_('Failed to load extension %(ext_factory)s: '
'%(exc)s') % locals()) '%(exc)s'),
{'ext_factory': ext_factory, 'exc': exc})
class ControllerExtension(object): class ControllerExtension(object):
@@ -344,19 +345,18 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
ext_mgr.load_extension(classpath) ext_mgr.load_extension(classpath)
except Exception as exc: except Exception as exc:
logger.warn(_('Failed to load extension %(classpath)s: ' logger.warn(_('Failed to load extension %(classpath)s: '
'%(exc)s') % locals()) '%(exc)s'),
{'classpath': classpath, 'exc': exc})
# Now, let's consider any subdirectories we may have... # Now, let's consider any subdirectories we may have...
subdirs = [] subdirs = []
for dname in dirnames: for dname in dirnames:
# Skip it if it does not have __init__.py # Skip it if it does not have __init__.py
if not os.path.exists(os.path.join(dirpath, dname, if not os.path.exists(os.path.join(dirpath, dname, '__init__.py')):
'__init__.py')):
continue continue
# If it has extension(), delegate... # If it has extension(), delegate...
ext_name = ("%s%s.%s.extension" % ext_name = "%s%s.%s.extension" % (package, relpkg, dname)
(package, relpkg, dname))
try: try:
ext = importutils.import_class(ext_name) ext = importutils.import_class(ext_name)
except ImportError: except ImportError:
@@ -367,8 +367,9 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
try: try:
ext(ext_mgr) ext(ext_mgr)
except Exception as exc: except Exception as exc:
logger.warn(_('Failed to load extension %(ext_name)s: ' logger.warn(_('Failed to load extension %(ext_name)s:'
'%(exc)s') % locals()) '%(exc)s'),
{'ext_name': ext_name, 'exc': exc})
# Update the list of directories we'll explore... # Update the list of directories we'll explore...
dirnames[:] = subdirs dirnames[:] = subdirs

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

@@ -916,7 +916,9 @@ class Resource(wsgi.Application):
return Fault(webob.exc.HTTPBadRequest(explanation=msg)) return Fault(webob.exc.HTTPBadRequest(explanation=msg))
if body: if body:
LOG.debug(_("Action: '%(action)s', body: %(body)s") % locals()) msg = _("Action: '%(action)s', body: "
"%(body)s") % {'action': action, 'body': body}
LOG.debug(msg)
LOG.debug(_("Calling method %s") % meth) LOG.debug(_("Calling method %s") % meth)
# Now, deserialize the request body... # Now, deserialize the request body...

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

@@ -739,10 +739,9 @@ class MasterTemplate(Template):
# Make sure we have a tree match # Make sure we have a tree match
if slave.root.tag != self.root.tag: if slave.root.tag != self.root.tag:
slavetag = slave.root.tag msg = _("Template tree mismatch; adding slave %(slavetag)s to "
mastertag = self.root.tag "master %(mastertag)s") % {'slavetag': slave.root.tag,
msg = _("Template tree mismatch; adding slave %(slavetag)s " 'mastertag': self.root.tag}
"to master %(mastertag)s") % locals()
raise ValueError(msg) raise ValueError(msg)
# Make sure slave applies to this template # Make sure slave applies to this template