openstack
/
glance
Code Issues Proposed changes

Merge "utils: stop building useless closure"

This commit is contained in:
Jenkins 2015-10-07 13:46:18 +00:00 committed by Gerrit Code Review
parent 360b03058e 67b7173ea6
commit 1590003904
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glance/common/utils.py
View File

@ -333,17 +333,17 @@ def create_mashup_dict(image_meta):
:param image_meta: metadata of image with core and custom properties
"""
def get_items():
for key, value in six.iteritems(image_meta):
if isinstance(value, dict):
for subkey, subvalue in six.iteritems(
create_mashup_dict(value)):
if subkey not in image_meta:
yield subkey, subvalue
else:
yield key, value
d = {}
for key, value in six.iteritems(image_meta):
if isinstance(value, dict):
for subkey, subvalue in six.iteritems(
create_mashup_dict(value)):
if subkey not in image_meta:
d[subkey] = subvalue
else:
d[key] = value
return dict(get_items())
return d
def safe_mkdirs(path):