openstack/python-cinderclient
Code Issues Proposed changes

Remove locals() from cinder client code base

Browse Source 
Hacking file now disallows locals() usage.

Change-Id: I5049c718c2706d606c12913ae0b33a0fb3263542
This commit is contained in:
Mike Perez
2013-07-31 16:03:17 -07:00
parent 53a0344608
commit 6193f2ba96
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinderclient/utils.py
View File

@@ -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()) conflicting_keys = set(hook_kwargs.keys()) & set(extra_kwargs.keys())
if conflicting_keys and not allow_conflicts: if conflicting_keys and not allow_conflicts:
raise Exception("Hook '%(hook_name)s' is attempting to redefine" msg = ("Hook '%(hook_name)s' is attempting to redefine attributes "
" attributes '%(conflicting_keys)s'" % locals()) "'%(conflicting_keys)s'" % {
'hook_name': hook_name,
'conflicting_keys': conflicting_keys
})
raise Exception(msg)
extra_kwargs.update(hook_kwargs) extra_kwargs.update(hook_kwargs)

2
cinderclient/v1/shell.py
View File

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

2
cinderclient/v2/shell.py
View File

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