openstack/python-cinderclient
Code Issues Proposed changes

Merge "Remove locals() from cinder client code base"

Browse Source
This commit is contained in:
Jenkins 2013-08-03 17:58:02 +00:00 committed by Gerrit Code Review
commit 55b2161c8f
3 changed files with 8 additions and 4 deletions
cinderclient
utils.py
v1
shell.py
v2
shell.py

8
cinderclient/utils.py

@ -88,8 +88,12 @@ def get_resource_manager_extra_kwargs(f, args, allow_conflicts=False):
conflicting_keys = set(hook_kwargs.keys()) & set(extra_kwargs.keys())
if conflicting_keys and not allow_conflicts:
raise Exception("Hook '%(hook_name)s' is attempting to redefine"
" attributes '%(conflicting_keys)s'" % locals())
msg = ("Hook '%(hook_name)s' is attempting to redefine attributes "
"'%(conflicting_keys)s'" % {
'hook_name': hook_name,
'conflicting_keys': conflicting_keys
})
raise Exception(msg)
extra_kwargs.update(hook_kwargs)

2
cinderclient/v1/shell.py

@ -53,7 +53,7 @@ def _poll_for_status(poll_fn, obj_id, action, final_ok_states,
print("\nFinished")
break
elif status == "error":
print("\nError %(action)s instance" % locals())
print("\nError %(action)s instance" % {'action': action})
break
else:
print_progress(progress)

2
cinderclient/v2/shell.py

@ -51,7 +51,7 @@ def _poll_for_status(poll_fn, obj_id, action, final_ok_states,
print("\nFinished")
break
elif status == "error":
print("\nError %(action)s instance" % locals())
print("\nError %(action)s instance" % {'action': action})
break
else:
print_progress(progress)